Changeset 14566

Timestamp:

11/05/12 18:43:46 (12 years ago)

Author:

tbretz

Message:

Do not return anything in JsGetEvent before an event was received

File:

• trunk/FACT++/src/RemoteControl.h (modified) (2 diffs)

trunk/FACT++/src/RemoteControl.h

@@ -262 +262 @@
 
         const auto it = fInfo.find(service);
+
+        // No subscription for this event available
         if (it==fInfo.end())
             return make_pair(0, static_cast<EventImp*>(NULL));
 
         EventInfo &info = it->second;
-        return make_pair(info.counter, (EventImp*)&info.data);
+
+        // No event was received yet
+        if (info.counter==0)
+            return make_pair(0, static_cast<EventImp*>(NULL));
+
+        return make_pair(info.counter-1, (EventImp*)&info.data);
     }
 
@@ -285 +292 @@
         EventInfo &info = it->second;
 
-        const uint64_t cnt = info.counter++;
+        const uint64_t cnt = ++info.counter;
         info.data = static_cast<Event>(evt);