add locks to async leader/follower props

micro-manager · Feb 24, 2022 · 9c39070 · 9c39070
1 parent 8d2d871
commit 9c39070
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/DeviceAdapters/DemoCamera/DemoCamera.cpp b/DeviceAdapters/DemoCamera/DemoCamera.cpp
@@ -1307,12 +1307,14 @@ void CDemoCamera::SlowPropUpdate()
       // in a thread
       long delay; GetProperty("AsyncPropertyDelayMS", delay);
       CDeviceUtils::SleepMs(delay);
+      MMThreadGuard g(asyncFollowerLock_);
       asyncFollower = asyncLeader;
       OnPropertyChanged("AsyncPropertyFollower", asyncFollower.c_str());
    }
 
 int CDemoCamera::OnAsyncFollower(MM::PropertyBase* pProp, MM::ActionType eAct)
 {
+   MMThreadGuard g(asyncFollowerLock_);
    if (eAct == MM::BeforeGet){
       pProp->Set(asyncFollower.c_str());
    }
@@ -1322,6 +1324,7 @@ int CDemoCamera::OnAsyncFollower(MM::PropertyBase* pProp, MM::ActionType eAct)
 
 int CDemoCamera::OnAsyncLeader(MM::PropertyBase* pProp, MM::ActionType eAct)
 {
+   MMThreadGuard g(asyncLeaderLock_);
    if (eAct == MM::BeforeGet){
       pProp->Set(asyncLeader.c_str());
    }

diff --git a/DeviceAdapters/DemoCamera/DemoCamera.h b/DeviceAdapters/DemoCamera/DemoCamera.h
@@ -272,6 +272,8 @@ class CDemoCamera : public CCameraBase<CDemoCamera>
    std::string asyncLeader;
    std::string asyncFollower;
    MMThreadLock imgPixelsLock_;
+   MMThreadLock asyncLeaderLock_;
+   MMThreadLock asyncFollowerLock_;
    friend class MySequenceThread;
    int nComponents_;
    MySequenceThread * thd_;