Index: trunk/FACT++/src/mcp.cc
===================================================================
--- trunk/FACT++/src/mcp.cc	(revision 12335)
+++ trunk/FACT++/src/mcp.cc	(revision 12336)
@@ -56,4 +56,5 @@
         kStateConfiguring3,
         kStateConfigured,
+//        kStateRunInProgress,
     };
 
@@ -174,5 +175,5 @@
     int StopRun(const EventImp &)
     {
-	if (fStatusFTM.second==FTM::kTakingData)
+	if (fStatusFTM.second==FTM::kTriggerOn)
 	{
             Message("Stopping FTM");
@@ -324,5 +325,11 @@
 
             if (GetCurrentState()==kStateConfigured)
-                return GetCurrentState();
+            {
+                if (fStatusFTM.second != FTM::kTriggerOn)
+                    return GetCurrentState();
+
+                // Now we are taking data... we could now wait for
+                // the fad to go back to -1
+            }
 
             return kStateIdle;