Fix a bug with pointer / cursor taking wrong icon / shape after choosing

File->New in main menu.

Also prevent vimageCleanup from being called unnecessarily from within
filemgmt.tcl when in edit mode.

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

diff --git a/exec.tcl b/exec.tcl
index 8d085bee5d6ac5db6e5698d1c673c01e86ef76d3..01e78a5284885b319a16c2423f428aef890adde3 100755 (executable)
--- a/exec.tcl
+++ b/exec.tcl
@@ -306,6 +306,8 @@ proc deployCfg {} {
 
 
 proc vimageCleanup {} {
+    global .c
+
     set t_start [clock seconds]
     set vimages [join [nexec vimage -l | fgrep -v "    " | cut -d: -f 1]]
     set defindex [lsearch $vimages default]
@@ -330,6 +332,7 @@ proc vimageCleanup {} {
     catch { nexec rm -f /usr/local/xorp/config.boot }
     catch { nexec mv /etc/resolv.conf.bak /etc/resolv.conf }
     statline "Cleanup completed in [expr [clock seconds] - $t_start] seconds."
+    .c config -cursor left_ptr
 }
 
 

diff --git a/filemgmt.tcl b/filemgmt.tcl
index 60f4c68635355fce9fddd3d6dbcb87b7598061e1..ec4ffb7c33c3975ce42430cd88ee9d7634f216c7 100755 (executable)
--- a/filemgmt.tcl
+++ b/filemgmt.tcl
@@ -78,9 +78,11 @@ set fileTypes {{"IMUNES network configuration" {.imn} }
 
 
 proc newFile {} {
-    global currentFile 
+    global currentFile oper_mode
 
-    vimageCleanup
+    if { $oper_mode == "exec" } {
+       vimageCleanup
+    }
     loadCfg ""
     redrawAll
     set currentFile ""