1 files changed, 4 insertions, 4 deletions
diff --git a/include/CommonAPI/DBus/DBusConnection.hpp b/include/CommonAPI/DBus/DBusConnection.hpp
index b5ec156..90a6cb6 100644
--- a/include/CommonAPI/DBus/DBusConnection.hpp
+++ b/include/CommonAPI/DBus/DBusConnection.hpp
@@ -301,7 +301,7 @@ public:
                                                            std::string interfaceMemberSignature);
 
     ::DBusConnection* connection_;
-    mutable std::mutex connectionGuard_;
+    mutable std::recursive_mutex connectionGuard_;
 
     std::mutex signalGuard_;
     std::mutex objectManagerGuard_;
@@ -365,10 +365,10 @@ public:
     mutable std::mutex mainloopTimeoutsMutex_;
 
     mutable std::mutex enforceTimeoutMutex_;
-    mutable std::condition_variable enforceTimeoutCondition_;
+    mutable std::condition_variable_any enforceTimeoutCondition_;
 
     mutable std::shared_ptr<std::thread> enforcerThread_;
-    mutable std::mutex enforcerThreadMutex_;
+    mutable std::recursive_mutex enforcerThreadMutex_;
     bool enforcerThreadCancelled_;
     ConnectionId_t connectionId_;
 
@@ -386,7 +386,7 @@ public:
     bool isWaitingOnFinishedDispatching_;
 
     std::set<std::thread::id> dispatchThreads_;
-    std::condition_variable dispatchCondition_;
+    std::condition_variable_any dispatchCondition_;
 };