commit f2a5806bf49432ee7d1f98e98b1bc66b31a4aa54
author Alexander Afanasyev <aa@cs.fiu.edu> Sat May 30 23:50:35 2020 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Sat May 30 23:50:35 2020 -0400
tree 2d30dabdb0256d9d5ad0521de02600a0eca7c60e
parent 84d15aa8ddd23210650351c4659ab183ee601a30

[ndnSIM] One more fix of the hacked scheduler

Change-Id: Ie95d771f5c955e7d4ae25ac2b61b93c84d5afd80

ndn-cxx/util/scheduler.cpp

diff --git a/ndn-cxx/util/scheduler.cpp b/ndn-cxx/util/scheduler.cpp
index c51bd75..df2c460 100644
--- a/ndn-cxx/util/scheduler.cpp
+++ b/ndn-cxx/util/scheduler.cpp
@@ -115,13 +115,11 @@
     return;
   }
 
-  if (info->queueIt == m_queue.begin()) {
-    if (m_timerEvent) {
-      if (!m_timerEvent->IsExpired()) {
-        ns3::Simulator::Remove(*m_timerEvent);
-      }
-      m_timerEvent.reset();
+  if (m_timerEvent) {
+    if (!m_timerEvent->IsExpired()) {
+      ns3::Simulator::Remove(*m_timerEvent);
     }
+    m_timerEvent.reset();
   }
   m_queue.erase(info->queueIt);