From 1f3f14740e386fc581c025c8ef2e201bfb0d739a Mon Sep 17 00:00:00 2001
From: Pieter Hijma <pieterhijma@users.noreply.github.com>
Date: Fri, 17 May 2024 11:29:49 +0200
Subject: [PATCH] Core: Maintain the lock while reading config file

---
 src/Base/Parameter.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Base/Parameter.cpp b/src/Base/Parameter.cpp
index 17c7d91eeb..66f5068cd9 100644
--- a/src/Base/Parameter.cpp
+++ b/src/Base/Parameter.cpp
@@ -1747,12 +1747,6 @@ int getTimeout()
     const int timeout = 5000;
     return timeout;
 }
-
-bool waitForReadAccess(const Base::FileInfo& file)
-{
-    QLockFile lock(getLockFile(file));
-    return lock.tryLock(getTimeout());
-}
 }  // namespace
 
 //**************************************************************************
@@ -1774,7 +1768,8 @@ int ParameterManager::LoadDocument(const char* sFileName)
 {
     try {
         Base::FileInfo file(sFileName);
-        if (!waitForReadAccess(file)) {
+        QLockFile lock(getLockFile(file));
+        if (!lock.tryLock(getTimeout())) {
             // Continue with empty config
             CreateDocument();
             SetIgnoreSave(true);