Index: /trunk/FACT++/src/smartfact.cc
===================================================================
--- /trunk/FACT++/src/smartfact.cc	(revision 14361)
+++ /trunk/FACT++/src/smartfact.cc	(revision 14362)
@@ -713,8 +713,8 @@
     }
 
-    void HandleControlStateChange(const EventImp &d)
+    int HandleControlStateChange(const EventImp &d)
     {
         if (d.GetSize()==0)
-            return;
+            return StateMachineImp::kSM_KeepState;
 
         // [0] DimControl::kReady (Idle)
@@ -731,5 +731,5 @@
 
         if (d.GetQoS()>=2)
-            return;
+            return StateMachineImp::kSM_KeepState;
 
 #if BOOST_VERSION < 104600
@@ -742,4 +742,6 @@
         if (!file.empty())
             HandleControlMessageImp(Event(d, file.data(), file.length()+1));
+
+        return StateMachineImp::kSM_KeepState;
     }
 
@@ -757,5 +759,5 @@
     }
 
-    void HandleFscControlStateChange(const EventImp &d)
+    int HandleFscControlStateChange(const EventImp &d)
     {
         const int32_t &last  = fDimFscControl.last.second;
@@ -763,5 +765,5 @@
 
         if (last==DimState::kOffline || state==DimState::kOffline)
-            return;
+            return StateMachineImp::kSM_KeepState;
 
         if (last<FSC::State::kConnected && state==FSC::State::kConnected)
@@ -776,4 +778,6 @@
             SetAudio("shutdown");
         }
+
+        return StateMachineImp::kSM_KeepState;
     }
 
@@ -924,5 +928,5 @@
     }
 
-    void HandleDriveControlStateChange(const EventImp &d)
+    int HandleDriveControlStateChange(const EventImp &d)
     {
         const int32_t &last  = fDimFscControl.last.second;
@@ -930,5 +934,5 @@
 
         if (last==DimState::kOffline || state==DimState::kOffline)
-            return;
+            return StateMachineImp::kSM_KeepState;
 
         if (last<Drive::State::kArmed && state>=Drive::State::kArmed)
@@ -937,4 +941,6 @@
         if (last>=Drive::State::kArmed && state<Drive::State::kArmed)
             AddMcpConfigurationHist(d, "Drive disconnected");
+
+        return StateMachineImp::kSM_KeepState;
     }
 
@@ -1757,5 +1763,5 @@
     // -------------------------------------------------------------------
 
-    void HandleDoTest(const EventImp &d)
+    int HandleDoTest(const EventImp &d)
     {
         ostringstream out;
@@ -1771,4 +1777,6 @@
 
         ofstream(fPath+"/dotest.data") << out.str();
+
+        return StateMachineImp::kSM_KeepState;
     }