Changeset 2049

Timestamp:

Jan 19, 2011, 12:13:29 PM (14 years ago)

Author:

gah

Message:

fixes for tester

Location:

trunk/gui/scripts

Files:

• resultset.tcl (modified) (1 diff)
• xyresult.tcl (modified) (1 diff)

trunk/gui/scripts/resultset.tcl

@@ -1084 +1084 @@
     } else {
         lappend params "???"
+    }
+    if { $_active == "" } {
+        return;                         # Nothing active. Don't do anything.
     }
     eval lappend params [_getValues $_active all]

trunk/gui/scripts/xyresult.tcl

@@ -1518 +1518 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::XyResult::GetAxes {dataobj} {
-    # rebuild if needed, so we know about the axes
-    if {[$_dispatcher ispending !rebuild]} {
-        $_dispatcher cancel !rebuild
-        $_dispatcher event -now !rebuild
-    }
-
+    if 0 {
+        # Don't do this. Given dataobj may be deleted in the rebuild
+
+        # rebuild if needed, so we know about the axes
+        if {[$_dispatcher ispending !rebuild]} {
+            $_dispatcher cancel !rebuild
+            $_dispatcher event -now !rebuild
+        }
+    }
     # what is the x axis?  x? x2? x3? ...
     set xlabel [$dataobj hints xlabel]