Unbreak canvas switching.

Bug found by:
Submitted by:
Reviewed by:
Approved by:
Obtained from:

diff --git a/initgui.tcl b/initgui.tcl
index 1ade3af2a0456c85329b38e6e020291f23260b80..c57a17baf28dedf006f5dc5f62e350d1e55ba6e2 100755 (executable)
--- a/initgui.tcl
+++ b/initgui.tcl
@@ -26,7 +26,7 @@
 # and Technology through the research contract #IP-2003-143.
 #
 
-# $Id: initgui.tcl,v 1.44 2008/01/05 18:06:25 marko Exp $
+# $Id: initgui.tcl,v 1.45 2008/01/07 10:53:15 marko Exp $
 
 
 #****h* imunes/initgui.tcl
@@ -269,6 +269,8 @@ menu .menubar.canvas -tearoff 0
 .menubar.canvas add command -label "Rename" -command { renameCanvasPopup 0 0 }
 .menubar.canvas add command -label "Delete" -command {
     upvar 0 ::cf::[set ::curcfg]::canvas_list canvas_list
+    upvar 0 ::cf::[set ::curcfg]::curcanvas curcanvas
+
     if { [llength [set $canvas_list]] == 1 } {
         return
     }
@@ -535,6 +537,8 @@ canvas .hframe.t -width 300 -height 18 -bd 0 -highlightthickness 0 \
        -background gray \
        -xscrollcommand ".hframe.ts set"
 bind .hframe.t <1> {
+    upvar 0 ::cf::[set ::curcfg]::curcanvas curcanvas
+
     set canvas [lindex [.hframe.t gettags current] 1]
     if { $canvas != "" && $canvas != $curcanvas } {
        set curcanvas $canvas
@@ -542,6 +546,8 @@ bind .hframe.t <1> {
     }
 }
 bind .hframe.t <Double-1> {
+    upvar 0 ::cf::[set ::curcfg]::curcanvas curcanvas
+
     set canvas [lindex [.hframe.t gettags current] 1]
     if { $canvas != "" } {
        if { $canvas != $curcanvas } {