summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Paul Mackerras <paulus@samba.org>2007-07-23 21:35:03 +1000
committerLibravatar Paul Mackerras <paulus@samba.org>2007-07-23 21:35:03 +1000
commit0eafba1405bf4db29bca0b535477beb3046441bf (patch)
treef33ecb7bddd8e507f1f99d6da3f922e0fd54a462
parent[PATCH] gitk: Bind keyboard actions to the command key on Mac OS (diff)
downloadtgif-0eafba1405bf4db29bca0b535477beb3046441bf.tar.xz
gitk: Wait for the window to become visible after creating it
When the git log process returned an error immediately, we were sometimes getting no main window and no error window displayed, with the gitk process just hanging waiting for something. It appears that the tkwait in show_error, which waits for the error window to be destroyed, wasn't sufficient to allow the main window or the error window to be mapped. This adds a wait in the main startup code after the main window has been created to wait until it is visible. This seems to fix the problem. Signed-off-by: Paul Mackerras <paulus@samba.org>
-rwxr-xr-xgitk2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitk b/gitk
index 66e4a643d6..5cfb1cc391 100755
--- a/gitk
+++ b/gitk
@@ -7646,6 +7646,8 @@ set localfrow -1
set lserial 0
setcoords
makewindow
+# wait for the window to become visible
+tkwait visibility .
wm title . "[file tail $argv0]: [file tail [pwd]]"
readrefs