git-gui: Paper bag fix error dialogs opening over the main window

If the main window is the only toplevel we have open then we
don't have a valid grab right now, so we need to assume the
best toplevel to use for the parent is ".".

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/lib/error.tcl b/lib/error.tcl
index 45800d54932bf1367cff81db040d1a14b87a9ab5..08a24622c7ff199399805ef34f0396f6cb81613c 100644 (file)
--- a/lib/error.tcl
+++ b/lib/error.tcl
@@ -2,7 +2,11 @@
 # Copyright (C) 2006, 2007 Shawn Pearce
 
 proc _error_parent {} {
-       return [grab current .]
+       set p [grab current .]
+       if {$p eq {}} {
+               return .
+       }
+       return $p
 }
 
 proc error_popup {msg} {