Fix potential deadlock

Wasted-Audio · Nov 7, 2024 · 8ab69e9 · 8ab69e9
1 parent dc2cb8c
commit 8ab69e9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Source/Sidebar/DocumentationBrowser.h b/Source/Sidebar/DocumentationBrowser.h
@@ -113,7 +113,7 @@ class DocumentationBrowserUpdateThread : public Thread
     ValueTree getCurrentTree()
     {
         ScopedLock treeLock(fileTreeLock);
-        return fileTree;
+        return fileTree.createCopy();
     }
 
     static DocumentationBrowserUpdateThread* getInstance()
@@ -212,9 +212,10 @@ class DocumentationBrowserUpdateThread : public Thread
             while (retries < maxRetries) {
                 if (threadShouldExit())
                     break;
-                if (fileTreeLock.tryEnter()) {
+
+                const ScopedTryLock stl (fileTreeLock);
+                if (stl.isLocked()) {
                     fileTree = generateDirectoryValueTree(File(SettingsFile::getInstance()->getProperty<String>("browser_path")));
-                    fileTreeLock.exit();
                     break;
                 }
                 retries++;
@@ -223,6 +224,7 @@ class DocumentationBrowserUpdateThread : public Thread
 
             sendChangeMessage();
         } catch (...) {
+
             std::cerr << "Failed to update documentation browser" << std::endl;
         }
     }