Changeset 11412 for trunk/Mars

Timestamp:

07/14/11 18:43:21 (13 years ago)

Author:

tbretz

Message:

Fixed a problem with a possible infinite loop in the display.

File:

• trunk/Mars/mbase/MStatusDisplay.cc (modified) (2 diffs)

trunk/Mars/mbase/MStatusDisplay.cc

@@ -1201 +1201 @@
         return;
 
+    //
+    // If we are in a multithreaded environment (gThreadXAR) we
+    // have to make sure, that thus function is called from
+    // the main thread.
+    //
+    if (gThreadXAR)
+    {
+        // Tell the X-Requester how to call this method
+        const TString str = MString::Format("%ld", (ULong_t)f);
+
+        TMethodCall call(IsA(), "UpdateTab", "NULL");
+        void *arr[4] = { NULL, &call, this, (void*)(const char*)str };
+
+        // If this is not the main thread return
+        if (((*gThreadXAR)("METH", 4, arr, NULL)))
+            return;
+    }
+
     TCanvas *c=GetCanvas(*f);
     if (!c)
@@ -1208 +1226 @@
     const TString title = c->GetTitle();
 
-    if (!title.IsNull() && name != title)
-        SetStatusLine1(title);
-
-    //
-    // If we are in a multithreaded environment (gThreadXAR) we
-    // have to make sure, that thus function is called from
-    // the main thread.
-    //
-    if (gThreadXAR)
-    {
-        // Tell the X-Requester how to call this method
-        TString str = MString::Format("%d", (ULong_t)f);
-
-        TMethodCall call(IsA(), "UpdateTab", "NULL");
-        void *arr[4] = { NULL, &call, this, (void*)(const char*)str };
-
-        // If this is not the main thread return
-        if (((*gThreadXAR)("METH", 4, arr, NULL)))
-            return;
-    }
+    if (!gROOT->IsBatch())
+        fStatusBar->SetText(title, 0);
+
+    // It seems that we cannot use this because an update
+    // initiated by a gui event can interfere with the regular
+    // update from the timer and then ProcessEvents will
+    // end in an infinite loop.
+    // SetStatusLine1(title);
+
 
     //