summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--unix/tkUnixWm.c7
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d9fee9..0e78aae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-23 Don Porter <dgp@users.sourceforge.net>
+
+ * unix/tkUnixWm.c: [Bugs 3554026,3561016] Stop crash with tearoff menus.
+
2012-08-23 Jan Nijtmans <nijtmans@users.sf.net>
* library/tk.tcl: [Bug 3555644]: Better use of virtual events,
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 09cd08d..60aaceb 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -6759,6 +6759,13 @@ TkSetTransientFor(Tk_Window tkwin, Tk_Window parent)
while (!Tk_IsTopLevel(parent))
parent = Tk_Parent(tkwin);
}
+ /*
+ * Prevent crash due to incomplete initialization, or other problems.
+ * [Bugs 3554026, 3561016]
+ */
+ if (((TkWindow *)parent)->wmInfoPtr->wrapperPtr == NULL) {
+ return;
+ }
XSetTransientForHint(Tk_Display(tkwin),
((TkWindow *)tkwin)->wmInfoPtr->wrapperPtr->window,
((TkWindow *)parent)->wmInfoPtr->wrapperPtr->window);