From 70ed01c155ebdfb191c372ce73b46f1a486c8128 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Wed, 12 Apr 2023 23:24:27 -0500 Subject: [PATCH] Fix switching radar sites while loading --- scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp index 9ea68f0c..293e69d5 100644 --- a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp @@ -164,6 +164,10 @@ public: auto& [key, providerManager] = p; providerManager->Disable(); }); + + // Lock other mutexes before destroying, ensure loading is complete + std::unique_lock loadLevel2DataLock {loadLevel2DataMutex_}; + std::unique_lock loadLevel3DataLock {loadLevel3DataMutex_}; } RadarProductManager* self_;