From 63e6ba770939953ececed6ecbb4ad9e4bfbdd91a Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 22 Aug 2025 19:25:01 -0500 Subject: [PATCH] Update initialization order to ensure initial log entries make it to log file --- scwx-qt/source/scwx/qt/main/main.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/scwx-qt/source/scwx/qt/main/main.cpp b/scwx-qt/source/scwx/qt/main/main.cpp index 13fb3a05..b255c7b6 100644 --- a/scwx-qt/source/scwx/qt/main/main.cpp +++ b/scwx-qt/source/scwx/qt/main/main.cpp @@ -53,10 +53,19 @@ int main(int argc, char* argv[]) args.push_back(argv[i]); } + if (!scwx::util::GetEnvironment("SCWX_TEST").empty()) + { + QStandardPaths::setTestModeEnabled(true); + } + // Initialize logger auto& logManager = scwx::qt::manager::LogManager::Instance(); logManager.Initialize(); + QCoreApplication::setApplicationName("Supercell Wx"); + + logManager.InitializeLogFile(); + logger_->info("Supercell Wx v{}.{} ({})", scwx::qt::main::kVersionString_, scwx::qt::main::kBuildNumber_, @@ -66,7 +75,6 @@ int main(int argc, char* argv[]) QApplication a(argc, argv); - QCoreApplication::setApplicationName("Supercell Wx"); scwx::network::cpr::SetUserAgent( fmt::format("SupercellWx/{}", scwx::qt::main::kVersionString_)); @@ -77,11 +85,6 @@ int main(int argc, char* argv[]) QCoreApplication::installTranslator(&translator); } - if (!scwx::util::GetEnvironment("SCWX_TEST").empty()) - { - QStandardPaths::setTestModeEnabled(true); - } - // Test to see if scwx was run with high privilege scwx::qt::main::PrivilegeChecker privilegeChecker; if (privilegeChecker.pre_settings_check()) @@ -116,7 +119,6 @@ int main(int argc, char* argv[]) Aws::InitAPI(awsSdkOptions); // Initialize application - logManager.InitializeLogFile(); scwx::qt::config::RadarSite::Initialize(); scwx::qt::config::CountyDatabase::Initialize(); scwx::qt::manager::SettingsManager::Instance().Initialize();