summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp@users.sourceforge.net <dgp>2012-08-25 01:55:24 (GMT)
committerdgp@users.sourceforge.net <dgp>2012-08-25 01:55:24 (GMT)
commita4fb655ab947bca02433ed17b0e3176692d7156b (patch)
tree81b84b282cc0086773306219fe893a94fa96b9e8
parent906b425fcfc4e60a19071c1d09006381f0635a5e (diff)
parent66f03c8fbfd7049344ae98d9e5803f9960ce192f (diff)
downloadtk-a4fb655ab947bca02433ed17b0e3176692d7156b.zip
tk-a4fb655ab947bca02433ed17b0e3176692d7156b.tar.gz
tk-a4fb655ab947bca02433ed17b0e3176692d7156b.tar.bz2
3554026 3561016 Better fix from Emiliano Gavilan.
-rw-r--r--unix/tkUnixWm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 60aaceb..99fcf73 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -6757,14 +6757,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) {
- return;
+ CreateWrapper(((TkWindow *)parent)->wmInfoPtr);
}
XSetTransientForHint(Tk_Display(tkwin),
((TkWindow *)tkwin)->wmInfoPtr->wrapperPtr->window,