From d1e9b47fc3141a3c5e983c5e4f20b421ac3ea4bb Mon Sep 17 00:00:00 2001
From: georgemoralis <giorgosmrls@gmail.com>
Date: Sat, 29 Nov 2025 15:07:26 +0200
Subject: [PATCH] removed load before init singleton

---
 src/core/emulator_settings.cpp | 2 +-
 src/main.cpp                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/emulator_settings.cpp b/src/core/emulator_settings.cpp
index 603b89c79..e63c5c1d6 100644
--- a/src/core/emulator_settings.cpp
+++ b/src/core/emulator_settings.cpp
@@ -41,7 +41,7 @@ void EmulatorSettings::PrintChangedSummary(const std::vector<std::string>& chang
 // ctor/dtor + singleton
 // --------------------
 EmulatorSettings::EmulatorSettings() {
-    Load();
+    // Load();
 }
 EmulatorSettings::~EmulatorSettings() {
     Save();
diff --git a/src/main.cpp b/src/main.cpp
index 67854d5a0..54b70b093 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,6 +31,7 @@ int main(int argc, char* argv[]) {
     // Load configurations
     std::shared_ptr<EmulatorSettings> emu_settings = std::make_shared<EmulatorSettings>();
     EmulatorSettings::SetInstance(emu_settings);
+    emu_settings->Load();
     const auto user_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir);
     Config::load(user_dir / "config.toml");