blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 04:20:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

County database must be loaded before settings

Browse source
This commit is contained in:
Dan Paulat 2023-12-08 06:00:17 -06:00
parent c970e73db8
commit bdb859480f
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scwx-qt/source/scwx/qt/main/main.cpp
View file

@ -1,5 +1,6 @@
#define _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING #define _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
#include <scwx/qt/config/county_database.hpp>
#include <scwx/qt/config/radar_site.hpp> #include <scwx/qt/config/radar_site.hpp>
#include <scwx/qt/main/main_window.hpp> #include <scwx/qt/main/main_window.hpp>
#include <scwx/qt/main/versions.hpp> #include <scwx/qt/main/versions.hpp>
@ -72,6 +73,7 @@ int main(int argc, char* argv[])
// Initialize application // Initialize application
scwx::qt::config::RadarSite::Initialize(); scwx::qt::config::RadarSite::Initialize();
scwx::qt::config::CountyDatabase::Initialize();
scwx::qt::manager::SettingsManager::Instance().Initialize(); scwx::qt::manager::SettingsManager::Instance().Initialize();
// Theme // Theme

3
scwx-qt/source/scwx/qt/manager/resource_manager.cpp
View file

@ -1,6 +1,5 @@
#include <scwx/qt/manager/resource_manager.hpp> #include <scwx/qt/manager/resource_manager.hpp>
#include <scwx/qt/manager/font_manager.hpp> #include <scwx/qt/manager/font_manager.hpp>
#include <scwx/qt/config/county_database.hpp>
#include <scwx/qt/model/imgui_context_model.hpp> #include <scwx/qt/model/imgui_context_model.hpp>
#include <scwx/qt/types/texture_types.hpp> #include <scwx/qt/types/texture_types.hpp>
#include <scwx/qt/util/texture_atlas.hpp> #include <scwx/qt/util/texture_atlas.hpp>
@ -33,8 +32,6 @@ static const std::vector<std::pair<types::Font, std::string>> fontNames_ {
void Initialize() void Initialize()
{ {
config::CountyDatabase::Initialize();
LoadFonts(); LoadFonts();
LoadTextures(); LoadTextures();
} }