From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 26 Sep 2007 18:05:54 +0000 (-0400)
Subject: git-gui: Don't delete console window namespaces too early
X-Git-Tag: gitgui-0.9.0~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f2d73ec0cb6d5937bb4a62a222f942e4f886d6e;p=git.git

git-gui: Don't delete console window namespaces too early

If the console finishes displaying its output and is "done" but
needs to draw a scrollbar to show the final output messages it
is possible for Tk to delete the window namespace before it does
the text widget updates, which means we are unable to add the
horizontal or vertical scrollbar to the window when the text
widget decides it cannot draw all glyphs on screen.

We need to delay deleting the window namespace until we know
the window is not going to ever be used again.  This occurs if
we are done receiving output, the command is successful and the
window is closed, or if the window is open and the user chooses
to close the window after the command has completed.

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

diff --git a/lib/console.tcl b/lib/console.tcl
index cde9a0926..c0e6fb3cc 100644
--- a/lib/console.tcl
+++ b/lib/console.tcl
@@ -179,23 +179,26 @@ method insert {txt} {
 method done {ok} {
 	if {$ok} {
 		if {[winfo exists $w.m.s]} {
+			bind $w.m.s <Destroy> [list delete_this $this]
 			$w.m.s conf -background green -text [mc "Success"]
 			if {$is_toplevel} {
 				$w.ok conf -state normal
 				focus $w.ok
 			}
+		} else {
+			delete_this
 		}
 	} else {
 		if {![winfo exists $w.m.s]} {
 			_init $this
 		}
+		bind $w.m.s <Destroy> [list delete_this $this]
 		$w.m.s conf -background red -text [mc "Error: Command Failed"]
 		if {$is_toplevel} {
 			$w.ok conf -state normal
 			focus $w.ok
 		}
 	}
-	delete_this
 }
 
 method _sb_set {sb orient first last} {