Fix race condition in ConfigObject::SetAuthority

fixes #11784

diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp
index 1cb6e3f3c5403ee72aef3ab4aec56b9a7268945c..560e8a58a0715b8755c1ff6a22ed5f5174c9b895 100644 (file)
--- a/lib/base/configobject.cpp
+++ b/lib/base/configobject.cpp
@@ -386,18 +386,18 @@ void ConfigObject::Activate(bool runtimeCreated)
 {
        CONTEXT("Activating object '" + GetName() + "' of type '" + GetType()->GetName() + "'");
 
-       Start(runtimeCreated);
-
-       ASSERT(GetStartCalled());
-
        {
                ObjectLock olock(this);
+
+               Start(runtimeCreated);
+
+               ASSERT(GetStartCalled());
                ASSERT(!IsActive());
                SetActive(true, true);
-       }
 
-       if (GetHAMode() == HARunEverywhere)
-               SetAuthority(true);
+               if (GetHAMode() == HARunEverywhere)
+                       SetAuthority(true);
+       }
 
        NotifyActive();
 }
@@ -422,11 +422,11 @@ void ConfigObject::Deactivate(bool runtimeRemoved)
                        return;
 
                SetActive(false, true);
-       }
 
-       SetAuthority(false);
+               SetAuthority(false);
 
-       Stop(runtimeRemoved);
+               Stop(runtimeRemoved);
+       }
 
        ASSERT(GetStopCalled());
 
@@ -465,6 +465,8 @@ void ConfigObject::Resume(void)
 
 void ConfigObject::SetAuthority(bool authority)
 {
+       ObjectLock olock(this);
+
        if (authority && GetPaused()) {
                SetResumeCalled(false);
                Resume();