summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-08-23 21:40:24 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-08-23 21:40:24 (GMT)
commitdceb6487b9e195d99e186db8c19889c67632e7dd (patch)
treeb19816dc407b206d638671323e89336484bb8e41
parent3e015bc690d012c2d7a83be914babd37cbd259c0 (diff)
downloadtk-dceb6487b9e195d99e186db8c19889c67632e7dd.zip
tk-dceb6487b9e195d99e186db8c19889c67632e7dd.tar.gz
tk-dceb6487b9e195d99e186db8c19889c67632e7dd.tar.bz2
3554026,3561016 Stop crash with tearoff menus.
-rw-r--r--ChangeLog4
-rw-r--r--unix/tkUnixWm.c7
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 52d9739..d540456 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-17 Jan Nijtmans <nijtmans@users.sf.net>
* win/nmakehlp.c: Add "-V<num>" option, in order to be able
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index cb5b643..fa130a1 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -6276,6 +6276,13 @@ TkSetTransientFor(tkwin, 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);