fixed critical bug in shutdown()

actor-framework · Aug 22, 2012 · 729c92d · 729c92d
1 parent bc411df
commit 729c92d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/singleton_manager.cpp b/src/singleton_manager.cpp
@@ -67,7 +67,10 @@ template<typename T>
 void stop_and_kill(std::atomic<T*>& ptr) {
     for (;;) {
         auto p = ptr.load();
-        if (ptr.compare_exchange_weak(p, nullptr)) {
+        if (p == nullptr) {
+            return;
+        }
+        else if (ptr.compare_exchange_weak(p, nullptr)) {
             p->stop();
             delete p;
             ptr = nullptr;