Changeset 13211 for trunk

Timestamp:

03/23/12 22:17:03 (13 years ago)

Author:

tbretz

Message:

Improves state handling.

File:

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

trunk/FACT++/src/magicweather.cc

@@ -286 +286 @@
 public:
     ConnectionWeather(ba::io_service& ioservice, MessageImp &imp) : Connection(ioservice, imp()),
-        fIsVerbose(true), fKeepAlive(ioservice)
+        fIsVerbose(true), fLastReport(Time::none), fLastReception(Time::none), fKeepAlive(ioservice)
     {
         SetLogStream(&imp);
@@ -309 +309 @@
     int GetState() const
     {
-        if (fLastReport+boost::posix_time::seconds(fInterval*2)>Time())
+        if (fLastReport.IsValid() && fLastReport+boost::posix_time::seconds(fInterval*2)>Time())
             return 3;
-        if (fLastReception+boost::posix_time::seconds(fInterval*2)>Time())
+
+        if (fLastReception.IsValid() && fLastReception+boost::posix_time::seconds(fInterval*2)>Time())
             return 2;
+
         return 1;