Index: /trunk/FACT++/src/mcp.cc
===================================================================
--- /trunk/FACT++/src/mcp.cc	(revision 11493)
+++ /trunk/FACT++/src/mcp.cc	(revision 11494)
@@ -174,4 +174,14 @@
     int StopRun(const EventImp &evt)
     {
+        if (fStatusFTM.second==FTM::kTakingData)
+            Dim::SendCommand("FTM_CONTROL/STOP");
+
+        // FIXME: Do step 2 only when FTM is stopped
+        if (fStatusFAD.second==FAD::kConnected)
+        {
+            Dim::SendCommand("FAD_CONTROL/ENABLE_TRIGGER_LINE",      bool(false));
+            Dim::SendCommand("FAD_CONTROL/ENABLE_CONTINOUS_TRIGGER", bool(false));
+        }
+
         return GetCurrentState();
     }