From 413993a205a35085c90f80ef81d048bd54f548a6 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sat, 25 Aug 2012 01:52:21 +0000
Subject: 3554026 3561016 Better fix from Emiliano Gavilan.

---
 unix/tkUnixWm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index fa130a1..1fe1174 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -6274,14 +6274,14 @@ TkSetTransientFor(tkwin, 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,
-- 
cgit v0.12