Index: trunk/FACT++/src/mcp.cc
===================================================================
--- trunk/FACT++/src/mcp.cc	(revision 16532)
+++ trunk/FACT++/src/mcp.cc	(revision 16534)
@@ -131,9 +131,11 @@
 
         // FIXME: Do step 2 only when FTM is stopped
-        if (fDimFAD.state()==FAD::State::kConnected)
+        if (fDimFAD.state()==FAD::State::kConnected || fDimFAD.state()==FAD::State::kRunInProgress)
         {
             //Dim::SendCommand("FAD_CONTROL/ENABLE_TRIGGER_LINE",      bool(false));
 	    Message("Stopping FAD");
             Dim::SendCommandNB("FAD_CONTROL/ENABLE_CONTINOUS_TRIGGER", bool(false));
+            if (fDimFAD.state()==FAD::State::kRunInProgress)
+                Dim::SendCommandNB("FAD_CONTROL/CLOSE_OPEN_FILES");
         }