Changeset 14673 for trunk

Timestamp:

11/20/12 18:23:49 (12 years ago)

Author:

tbretz

Message:

Fixed a problem with the states if at startup the ftmctrl is not running.

File:

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

trunk/FACT++/src/ratescan.cc

@@ -246 +246 @@
     int HandleFtmStateChange(/*const EventImp &evt*/)
     {
-        // All subsystems are not connected
-        if (fDimFTM.state()<FTM::State::kConnected)
-            return RateScan::State::kDisconnected;
-
         // ftmctrl connected to FTM
-        if (GetCurrentState()==RateScan::State::kDisconnected)
-            return RateScan::State::kConnected;
-
         if (GetCurrentState()!=RateScan::State::kConfiguring)
             return GetCurrentState();
@@ -374 +367 @@
         if (!fDim.online())
             return RateScan::State::kDimNetworkNA;
+
+        // All subsystems are not connected
+        if (fDimFTM.state()<FTM::State::kConnected)
+            return RateScan::State::kDisconnected;
+
+        // ftmctrl connected to FTM
+        if (GetCurrentState()==RateScan::State::kDisconnected)
+            return RateScan::State::kConnected;
 
         return GetCurrentState();