Changeset 19359

Timestamp:

11/07/18 20:47:11 (6 years ago)

Author:

tbretz

Message:

The single step mode was never working properly -- fixed.

File:

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

trunk/Mars/mbase/MEvtLoop.cc

@@ -299 +299 @@
         switch (fDisplay->CheckStatus())
         {
+        case MStatusDisplay::kLoopStep:
+            // Skip if this is a single step and nothing is to be displayed
+            if (looprc==kCONTINUE)
+                break;
+            //**FALLTHROU**/
         case MStatusDisplay::kLoopPause:
-            fDisplay->SetStatusLine1(MString::Format("Paused after %d", num-1));
+            // Output current position in loop
+            fDisplay->SetStatusLine1(MString::Format("Paused after index %d", num-1));
+            // In case of a singel step go back to pause mode
+            fDisplay->SetPause();
+            // Wait until the user turns of pause mode
             while (fDisplay && fDisplay->CheckStatus()==MStatusDisplay::kLoopPause)
             {
@@ -306 +315 @@
                 gSystem->Sleep(1);
             }
-            // FALLTHROUGH
-        case MStatusDisplay::kLoopStep:
-            if (fDisplay && fDisplay->CheckStatus()==MStatusDisplay::kLoopStep && looprc!=kCONTINUE)
-            {
-                //fDisplay->ClearStatus();
-                fDisplay->SetPause();
-            }
-            // FALLTHROUGH
+            if (fDisplay->CheckStatus()==MStatusDisplay::kLoopStep)
+                break;
+            return ProcessGuiEvents(num, looprc);
+
         case MStatusDisplay::kLoopNone:
             break;