From: Tobias Pietzsch <pietzsch@mycroft.speedport.ip>
Date: Sat, 9 Jan 2021 22:14:08 +0000 (+0100)
Subject: gitk: check main window visibility before waiting for it to show
X-Git-Tag: v2.48.0-rc1~31^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2afd8996aec692a26c3cdb039a47c18809148c56;p=thirdparty%2Fgit.git

gitk: check main window visibility before waiting for it to show

If the main window is already visible when gitk waits for it to
become visible, gitk hangs forever.
This commit adds a check whether the window is already visible.
See https://wiki.tcl-lang.org/page/tkwait+visibility

Signed-off-by: Tobias Pietzsch <pietzsch@mycroft.speedport.ip>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---

diff --git a/gitk b/gitk
index 7a087f123d..de278557b3 100755
--- a/gitk
+++ b/gitk
@@ -12687,7 +12687,7 @@ catch {
     wm iconphoto . -default gitlogo gitlogo32
 }
 # wait for the window to become visible
-tkwait visibility .
+if {![winfo viewable .]} {tkwait visibility .}
 set_window_title
 update
 readrefs