Changeset 11584 for trunk

Timestamp:

07/25/11 13:02:52 (13 years ago)

Author:

tbretz

Message:

Fixed 'Connecting' status when thread is not running and sockdef!=0.

File:

• trunk/FACT++/src/fadctrl.cc (modified) (3 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -1383 +1383 @@
             stat2[idx] = GetNumConnected(idx);
 
-            if (IsConnecting(idx))
+            if (runs && IsConnecting(idx))
             {
                 nconnecting2++;
@@ -1398 +1398 @@
         // ===== Send connection status via dim =====
 
-        if (fStatus1!=stat1 || fStatus2!=stat2 || fStatusT!=IsThreadRunning())
+        if (fStatus1!=stat1 || fStatus2!=stat2 || fStatusT!=runs)
         {
             fStatus1 = stat1;
             fStatus2 = stat2;
             fStatusT = runs;
-            UpdateConnectionStatus(stat1, stat2, IsThreadRunning());
+            UpdateConnectionStatus(stat1, stat2, runs);
         }
 
@@ -1452 +1452 @@
 
         // nconnected1 == nconnected2 == 0
-        return IsThreadRunning() ? FAD::kDisconnected : FAD::kOffline;
+        return runs ? FAD::kDisconnected : FAD::kOffline;
     }