Changeset 18126

Timestamp:

02/13/15 09:34:27 (10 years ago)

Author:

tbretz

Message:

Only go to Locked automatically when a shutdown was really initiatied.

File:

• trunk/FACT++/src/biasctrl.cc (modified) (2 diffs)

trunk/FACT++/src/biasctrl.cc

@@ -1916 +1916 @@
         if (now>fSunRise)
         {
-            if ((state==State::kRamping       ||
-                 state==State::kVoltageOn     ||
-                 state==State::kNotReferenced ||
-                 state==State::kOverCurrent))
+            const bool shutdown =
+                state==State::kRamping       ||
+                state==State::kVoltageOn     ||
+                state==State::kNotReferenced ||
+                state==State::kOverCurrent;
+
+            if (shutdown)
             {
                 T::Error("Voltage on at end of nautical twilight!");
@@ -1931 +1934 @@
             T::Info(msg);
 
-            return State::kLocked;
+            if (shutdown)
+                return State::kLocked;
         }