diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-27 17:44:47 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-27 17:44:47 (GMT) |
| commit | cbc322379f8ec1ff728d196347312e8441a3a154 (patch) | |
| tree | 6d1c6cec0560b90c359e57d9771574bd24c01b09 /unix/tkUnixWm.c | |
| parent | d3e4f0bc9405b86444625dede7f676cb3d709df5 (diff) | |
| parent | e4c7ef5bdf6375e1860418b1ec92c07f88660cc8 (diff) | |
| download | tk-cbc322379f8ec1ff728d196347312e8441a3a154.zip tk-cbc322379f8ec1ff728d196347312e8441a3a154.tar.gz tk-cbc322379f8ec1ff728d196347312e8441a3a154.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix/tkUnixWm.c')
| -rw-r--r-- | unix/tkUnixWm.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index 9df3eae..3362081 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -6823,7 +6823,14 @@ TkSetTransientFor(Tk_Window tkwin, Tk_Window parent) if (parent == None) { parent = Tk_Parent(tkwin); while (!Tk_IsTopLevel(parent)) - parent = Tk_Parent(tkwin); + parent = Tk_Parent(parent); + } + /* + * Prevent crash due to incomplete initialization, or other problems. + * [Bugs 3554026, 3561016] + */ + if (((TkWindow *)parent)->wmInfoPtr->wrapperPtr == NULL) { + CreateWrapper(((TkWindow *)parent)->wmInfoPtr); } XSetTransientForHint(Tk_Display(tkwin), ((TkWindow *)tkwin)->wmInfoPtr->wrapperPtr->window, |