safeguard

5 years ago · 8ca7b4c548
1 changed files with 5 additions and 3 deletions
--- a/callback_dispatcher.cc
+++ b/callback_dispatcher.cc
@ -30,9 +30,11 @@ namespace pEp {

        targets.push_back({messageToSend, notifyHandshake, on_startup, shutdown});

-        // try_unlock() possibly waiting messageToSend
-        sync_mtx.try_lock();
-        sync_mtx.unlock();
+        if (!Adapter::on_sync_thread()) {
+            // try_unlock() possibly waiting messageToSend
+            sync_mtx.try_lock();
+            sync_mtx.unlock();
+        }
    }

    void CallbackDispatcher::remove(::messageToSend_t messageToSend)