Skip to content

Commit 959f15a

Browse files
dschomjcheetham
authored andcommitted
gitk: check main window visibility before waiting for it to show (#705)
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 This ports git#944 to `microsoft/git`. for Git. Fixed issue #704.
2 parents fcdfc1d + 4760f28 commit 959f15a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

gitk-git/gitk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12832,7 +12832,7 @@ if {$::tcl_platform(platform) eq {windows} && [file exists $gitk_prefix/etc/git.
1283212832
}
1283312833
}
1283412834
# wait for the window to become visible
12835-
tkwait visibility .
12835+
if {![winfo viewable .]} {tkwait visibility .}
1283612836
set_window_title
1283712837
update
1283812838
readrefs

0 commit comments

Comments
 (0)