From bdb859480f1952051d9251a23343c57a3119ce19 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 8 Dec 2023 06:00:17 -0600 Subject: [PATCH] County database must be loaded before settings --- scwx-qt/source/scwx/qt/main/main.cpp | 2 ++ scwx-qt/source/scwx/qt/manager/resource_manager.cpp | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scwx-qt/source/scwx/qt/main/main.cpp b/scwx-qt/source/scwx/qt/main/main.cpp index 82e9b152..8a52aab2 100644 --- a/scwx-qt/source/scwx/qt/main/main.cpp +++ b/scwx-qt/source/scwx/qt/main/main.cpp @@ -1,5 +1,6 @@ #define _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING +#include #include #include #include @@ -72,6 +73,7 @@ int main(int argc, char* argv[]) // Initialize application scwx::qt::config::RadarSite::Initialize(); + scwx::qt::config::CountyDatabase::Initialize(); scwx::qt::manager::SettingsManager::Instance().Initialize(); // Theme diff --git a/scwx-qt/source/scwx/qt/manager/resource_manager.cpp b/scwx-qt/source/scwx/qt/manager/resource_manager.cpp index df4b4f77..c9c40b6b 100644 --- a/scwx-qt/source/scwx/qt/manager/resource_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/resource_manager.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -33,8 +32,6 @@ static const std::vector> fontNames_ { void Initialize() { - config::CountyDatabase::Initialize(); - LoadFonts(); LoadTextures(); }