From 90be8fafb39469bd2c318c033e63294ebaad2ca4 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 30 Nov 2025 14:25:32 +0100 Subject: Core/Misc: Use std::scoped_lock instead of unique_lock where possible (and old lock_guard) --- src/common/Collision/Management/VMapManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common/Collision/Management/VMapManager.cpp') diff --git a/src/common/Collision/Management/VMapManager.cpp b/src/common/Collision/Management/VMapManager.cpp index 57d68708f46..98137de183d 100644 --- a/src/common/Collision/Management/VMapManager.cpp +++ b/src/common/Collision/Management/VMapManager.cpp @@ -273,7 +273,7 @@ namespace VMAP std::shared_ptr worldmodel; // this is intentionally declared before lock so that it is destroyed after it to prevent deadlocks in releaseModelInstance //! Critical section, thread safe access to iLoadedModelFiles - std::lock_guard lock(LoadedModelFilesLock); + std::scoped_lock lock(LoadedModelFilesLock); auto& [key, model] = *iLoadedModelFiles.try_emplace(filename).first; worldmodel = model.lock(); @@ -296,7 +296,7 @@ namespace VMAP void VMapManager::releaseModelInstance(std::string const& filename) { //! Critical section, thread safe access to iLoadedModelFiles - std::lock_guard lock(LoadedModelFilesLock); + std::scoped_lock lock(LoadedModelFilesLock); TC_LOG_DEBUG("maps", "VMapManager: unloading file '{}'", filename); -- cgit v1.2.3