MMCore: simplify notificationQueueMutex_

MMCore/MMCore.cpp

@@ -7769,7 +7769,7 @@ void CMMCore::registerCallback(MMEventCallback* cb) MMCORE_LEGACY_THROW(CMMError
    if (cb) {
       if (!notificationQueue_) {
          auto queue = std::make_shared<mmi::NotificationQueue>();
-         std::unique_lock<std::shared_mutex> lock(notificationQueueMutex_);
+         std::lock_guard<std::mutex> lock(notificationQueueMutex_);
          notificationQueue_ = queue;
       }
 
@@ -7786,17 +7786,21 @@ void CMMCore::registerCallback(MMEventCallback* cb) MMCORE_LEGACY_THROW(CMMError
          }
       });
    } else {
-      std::unique_lock<std::shared_mutex> lock(notificationQueueMutex_);
+      std::lock_guard<std::mutex> lock(notificationQueueMutex_);
       notificationQueue_.reset();
    }
 }
 
 
 void CMMCore::postNotification(mmi::Notification notification)
 {
-   std::shared_lock<std::shared_mutex> lock(notificationQueueMutex_);
-   if (notificationQueue_)
-      notificationQueue_->Push(std::move(notification));
+   std::shared_ptr<mmi::NotificationQueue> q;
+   {
+      std::lock_guard<std::mutex> lock(notificationQueueMutex_);
+      q = notificationQueue_;
+   }
+   if (q)
+      q->Push(std::move(notification));
 }
 
 

MMCore/MMCore.h

@@ -62,7 +62,6 @@
 #include <map>
 #include <memory>
 #include <mutex>
-#include <shared_mutex>
 #include <string>
 #include <thread>
 #include <vector>
@@ -738,7 +737,7 @@ class CMMCore
    bool isLoadingSystemConfiguration_ = false;
 
    std::mutex callbackMutex_; // Serializes registerCallback() calls
-   std::shared_mutex notificationQueueMutex_; // Protects notificationQueue_
+   std::mutex notificationQueueMutex_; // Protects notificationQueue_
    std::shared_ptr<mmcore::internal::NotificationQueue>
       notificationQueue_;
    std::thread notificationDeliveryThread_;