timermanager: Make sure the correct timer is popped.

Pop using the ID just in case some other thread pushes a timer with
higher priority to the priority queue.

Author: joevt

core/timermanager.cpp

@@ -95,6 +95,7 @@ uint64_t TimerManager::process_timers()
     cur_timer = this->timer_queue.top();
 } // ] mtx scope
     while (cur_timer->timeout_ns <= time_now) {
+        this->timer_queue.remove_by_id(cur_timer->id);
         uint64_t timeout_ns = cur_timer->timeout_ns;
         timer_cb cb = cur_timer->cb;
 
@@ -105,11 +106,7 @@ uint64_t TimerManager::process_timers()
             if (timeout_ns_new <= time_now)
                 timeout_ns_new = time_now + cur_timer->interval_ns;
             cur_timer->timeout_ns = timeout_ns_new;
-            this->timer_queue.remove_by_id(cur_timer->id);
             this->timer_queue.push(cur_timer);
-        } else {
-            // remove one-shot timers from queue
-            this->timer_queue.pop();
         }
 
         this->cb_active = true;