From 2370164f3ceb833b9b4128d80bdfcc81e58682f9 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Tue, 17 Jul 2007 22:45:53 -0400 Subject: [PATCH] git-gui: Don't crash in ask_popup if we haven't mapped main window yet If we have more than our desired number of objects and we try to open the "Do you want to repack now?" dialog we cannot include a -parent . argument if the main window has not been mapped yet. On Mac OS X it appears this window isn't mapped right away, so we had better hang avoid including it. Signed-off-by: Shawn O. Pearce --- lib/error.tcl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/error.tcl b/lib/error.tcl index d0253ae2f..16a22187b 100644 --- a/lib/error.tcl +++ b/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} { -- 2.26.2