Debug simulator

1 files changed, 4 insertions, 3 deletions

diff --git a/src/simulator.cc b/src/simulator.cc
index 865aabc..a0b55bd 100644
--- a/src/simulator.cc
+++ b/src/simulator.cc
@@ -285,6 +285,9 @@ static void obs_node(std::vector<std::string> args) {
                             }
                             if(i.shutdown_on_rcv)
                                 upuntil=CLOCK;
+                            // Check if we use unschedule_on_rcv
+                            if(i.unschedule_on_rcv)
+                                i.ResetEvents(CLOCK);
                             nDataRcv++;
                             isObserver=true;
                             is_sender=false;
@@ -344,11 +347,9 @@ static void obs_node(std::vector<std::string> args) {
             uptime=upuntil-CLOCK; // Note that uptime can be < 0 in extended mode
             uptime=uptime > 0 ? uptime : 0; // Just in case
         }
-        // Check if we use unschedule_on_rcv
-        if(i.unschedule_on_rcv)
-            i.ResetEvents(CLOCK);
         // Load next event
         i.GotoNextEvent();
+
         nWakeUp++; // Increase the number of wake up
         totalUptime+=CLOCK-upsince; // Synchronize total uptime
     }