Index: /trunk/FACT++/src/drivectrl.cc
===================================================================
--- /trunk/FACT++/src/drivectrl.cc	(revision 18387)
+++ /trunk/FACT++/src/drivectrl.cc	(revision 18388)
@@ -2174,5 +2174,5 @@
     {
         const int rc = CheckState();
-        return rc>0 ? rc : T::GetCurrentState();
+        return rc>0 ? rc : State::kInitialized;
     }
 
@@ -2516,17 +2516,12 @@
         if (now>fSunRise && T::GetCurrentState()!=State::kParking)
         {
-            if (T::GetCurrentState()>State::kLocked && T::GetCurrentState()!=StateMachineImp::kError)
+            fSunRise = now.GetNextSunRise();
+
+            ostringstream msg;
+            msg << "Next sun-rise will be at " << fSunRise;
+            T::Info(msg);
+
+            if (T::GetCurrentState()>State::kArmed && T::GetCurrentState()!=StateMachineImp::kError)
                 return Park();
-
-            if (T::GetCurrentState()==State::kLocked)
-            {
-                fSunRise = now.GetNextSunRise();
-
-                ostringstream msg;
-                msg << "Next sun-rise will be at " << fSunRise;
-                T::Info(msg);
-
-                return State::kLocked;
-            }
         }