Merge branch 'master' of git://repo.or.cz/git-gui

[git.git] / git-gui / lib / error.tcl

diff --git a/git-gui/lib/error.tcl b/git-gui/lib/error.tcl
index d0253ae2ffa72e491784434ff6ad98ed675ff10c..16a22187b26760963069bef14673b1791b311c12 100644 (file)
--- a/git-gui/lib/error.tcl
+++ b/git-gui/lib/error.tcl
@@ -51,12 +51,15 @@ proc ask_popup {msg} {
        if {[reponame] ne {}} {
                append title " ([reponame])"
        }
-       return [tk_messageBox \
-               -parent . \
+       set cmd [list tk_messageBox \
                -icon question \
                -type yesno \
                -title $title \
                -message $msg]
+       if {[winfo ismapped .]} {
+               lappend cmd -parent .
+       }
+       eval $cmd
 }
 
 proc hook_failed_popup {hook msg} {