From 54fd86de5c2ee380b18fb421d8157ba673730e91 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 14 Sep 2025 11:48:25 -0500 Subject: [PATCH 1/3] Ensure level 3 product is validated in settings to prevent crash on invalid value --- scwx-qt/source/scwx/qt/settings/map_settings.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scwx-qt/source/scwx/qt/settings/map_settings.cpp b/scwx-qt/source/scwx/qt/settings/map_settings.cpp index 76c09d30..675071b9 100644 --- a/scwx-qt/source/scwx/qt/settings/map_settings.cpp +++ b/scwx-qt/source/scwx/qt/settings/map_settings.cpp @@ -86,8 +86,9 @@ public: } else { - // TODO: Validate level 3 product - return true; + // Validate level 3 product + auto level3Product = common::GetLevel3ProductByAwipsId(value); + return !level3Product.empty() && level3Product != "?"; } }); From d687d04d7601a1d67dc1c5626525936a6a354938 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 14 Sep 2025 13:59:24 -0500 Subject: [PATCH 2/3] Make sure level3Product is const --- scwx-qt/source/scwx/qt/settings/map_settings.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scwx-qt/source/scwx/qt/settings/map_settings.cpp b/scwx-qt/source/scwx/qt/settings/map_settings.cpp index 675071b9..74b156b5 100644 --- a/scwx-qt/source/scwx/qt/settings/map_settings.cpp +++ b/scwx-qt/source/scwx/qt/settings/map_settings.cpp @@ -87,7 +87,8 @@ public: else { // Validate level 3 product - auto level3Product = common::GetLevel3ProductByAwipsId(value); + const auto level3Product = + common::GetLevel3ProductByAwipsId(value); return !level3Product.empty() && level3Product != "?"; } }); From eed2736ddee6db98d8f0169cc15fb245e5c39961 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 14 Sep 2025 14:00:27 -0500 Subject: [PATCH 3/3] Update level 3 defaults in test data --- test/data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/data b/test/data index c68bee74..fd8bc8bf 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit c68bee74549963e9a02e0fa998efad0f10f8256b +Subproject commit fd8bc8bf1d07474886ce6773abffab4d315d0cd0