Bugfix: applying an empty custom-config would lead to a deadlock in GUI.

Bugfix: correctly implement removeCanvas procedure.

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

diff --git a/canvas.tcl b/canvas.tcl
index 0bb61d801095e5b82e22268634b84644cbad7915..802e59276ad0cc81fb739e188479398d765f2d3d 100755 (executable)
--- a/canvas.tcl
+++ b/canvas.tcl
@@ -32,7 +32,11 @@
 
 
 proc removeCanvas { canvas } {
-    #puts "removeCanvas $canvas"
+    global canvass $canvas
+
+    set i [lsearch $canvass $canvas]
+    set canvass [lreplace $canvass $i $i]
+    set $canvas {}
     return
 }
 
@@ -43,5 +47,6 @@ proc newCanvas { name } {
     set canvas c0
     global $canvas
     lappend canvass $canvas
-    set $canvas {{name default}}
+    set $canvas {name default}
+    return
 }

diff --git a/editor.tcl b/editor.tcl
index 0662067be5431a64e271b938ccc4ee847a662ade..ab6f3ae2ff0289da16e602753f8a4008d63389d3 100755 (executable)
--- a/editor.tcl
+++ b/editor.tcl
@@ -1316,7 +1316,7 @@ proc customConfigApply { w node } {
 
     set newcmd [$w.ftop.cmd get]
     set newconf [split [$w.text get 0.0 end] {\r}]
-    while { [lindex $newconf end] == {} } {
+    while { [lindex $newconf end] == {} && $newconf != {} } {
        set newconf [lreplace $newconf end end]
     }
     if { [getCustomCmd $node] != $newcmd || \