diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-08-23 21:41:43 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-08-23 21:41:43 (GMT) |
| commit | 380c34bf78442205cf339902991f5c8079b1cf53 (patch) | |
| tree | f215e8243e70d863e37e62c90bc36ccd2d3730de | |
| parent | b4a326742ae0c1029ea11c1df3633dfc278f8cd0 (diff) | |
| parent | 543c8093fc2c2a6b9b8558129614a37f061305dd (diff) | |
| download | tk-380c34bf78442205cf339902991f5c8079b1cf53.zip tk-380c34bf78442205cf339902991f5c8079b1cf53.tar.gz tk-380c34bf78442205cf339902991f5c8079b1cf53.tar.bz2 | |
3554026,3561016 Stop crash with tearoff menus.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | unix/tkUnixWm.c | 7 |
2 files changed, 11 insertions, 0 deletions
@@ -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 1d66412..c79f7cb 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -6755,6 +6755,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); |