From 416d91057758acfe8dcd82a01a81ef48182b1959 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 31 Jul 2019 20:13:33 -0700
Subject: [PATCH] Timer: further attempt to avoid state corruption

---
 src/misc/timer.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/misc/timer.cpp b/src/misc/timer.cpp
index fe7707a..ae8dcb1 100644
--- a/src/misc/timer.cpp
+++ b/src/misc/timer.cpp
@@ -61,7 +61,10 @@ bool Timer::cancel(TimerCallbackPtr const &timerCallback)
 {
     Lock xx(mutex);
     if(!timerCallback->onList) return false;
-    if(!alive) return true;
+    if(!alive) {
+        timerCallback->onList = false;
+        return true;
+    }
     for(queue_t::iterator it(queue.begin()), end(queue.end()); it != end; ++it)
     {
         TimerCallbackPtr& cur = *it;