Core: Maintain the lock while reading config file

2024-05-17 11:29:49 +02:00
parent 281230c520
commit 1f3f14740e
1 changed files with 2 additions and 7 deletions
--- 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);