Index: /trunk/FACT++/src/StateMachineImp.cc
===================================================================
--- /trunk/FACT++/src/StateMachineImp.cc	(revision 10489)
+++ /trunk/FACT++/src/StateMachineImp.cc	(revision 10490)
@@ -141,6 +141,15 @@
     // queue is empty
     if (fEventQueue.size())
-        for (Event *q=fEventQueue.front(); q; fEventQueue.pop())
+    {
+        while (1)
+        {
+            Event *q=fEventQueue.front();
+            if (!q)
+                break;
+
+            fEventQueue.pop();
             delete q;
+        }
+    }
 }
 
@@ -1009,5 +1018,5 @@
     }
 
-    fRunning       = true;
+    fRunning       = !dummy;
     fExitRequested = 0;