gitk: Fix error when changing colors after closing "List references" window

This fixes an error that manifests itself if the user opens the
"List references" window and the closes it, and subsequently opens
the Preferences window and changes one of the colors.  When the
user clicks OK, and error popup appears with the message:

Error: invalid command name ".showrefs.list"

This is because .showrefs.list was added to the list of windows to
be notified on foreground/background color changes, but the window
no longer exists.  We fix the bug by checking whether the window
exists before trying to change its colors.  As an optimization, we
also avoid adding the .showrefs.list window to the list a second
time.

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/gitk b/gitk
index 07bdff6e5f2b714762d667c781a90e1bf1944893..c18670488d3cca6f86c271b9292627df16f6d551 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -9819,8 +9819,10 @@ proc showrefs {} {
        -width 30 -height 20 -cursor $maincursor \
        -spacing1 1 -spacing3 1 -state disabled
     $top.list tag configure highlight -background $selectbgcolor
        -width 30 -height 20 -cursor $maincursor \
        -spacing1 1 -spacing3 1 -state disabled
     $top.list tag configure highlight -background $selectbgcolor

-    lappend bglist $top.list
-    lappend fglist $top.list
+    if {![lsearch -exact $bglist $top.list]} {
+       lappend bglist $top.list
+       lappend fglist $top.list
+    }

     ${NS}::scrollbar $top.ysb -command "$top.list yview" -orient vertical
     ${NS}::scrollbar $top.xsb -command "$top.list xview" -orient horizontal
     grid $top.list $top.ysb -sticky nsew
     ${NS}::scrollbar $top.ysb -command "$top.list yview" -orient vertical
     ${NS}::scrollbar $top.xsb -command "$top.list xview" -orient horizontal
     grid $top.list $top.ysb -sticky nsew


@@ -11532,7 +11534,9 @@ proc choosecolor {v vi w x cmd} {
 proc setselbg {c} {
     global bglist cflist
     foreach w $bglist {
 proc setselbg {c} {
     global bglist cflist
     foreach w $bglist {

-       $w configure -selectbackground $c
+       if {[winfo exists $w]} {
+           $w configure -selectbackground $c
+       }

     }
     $cflist tag configure highlight \
        -background [$cflist cget -selectbackground]
     }
     $cflist tag configure highlight \
        -background [$cflist cget -selectbackground]


@@ -11558,7 +11562,9 @@ proc setbg {c} {
     global bglist
 
     foreach w $bglist {
     global bglist
 
     foreach w $bglist {

-       $w conf -background $c
+       if {[winfo exists $w]} {
+           $w conf -background $c
+       }

     }
 }
 
     }
 }
 


@@ -11566,7 +11572,9 @@ proc setfg {c} {
     global fglist canv
 
     foreach w $fglist {
     global fglist canv
 
     foreach w $fglist {

-       $w conf -foreground $c
+       if {[winfo exists $w]} {
+           $w conf -foreground $c
+       }

     }
     allcanvs itemconf text -fill $c
     $canv itemconf circle -outline $c
     }
     allcanvs itemconf text -fill $c
     $canv itemconf circle -outline $c