From 4fbd9608f290bd1bc9a422e1a3283db6a968e0c9 Mon Sep 17 00:00:00 2001
From: Stephen Miller <56742918+StevenMiller123@users.noreply.github.com>
Date: Mon, 1 Jun 2026 20:44:06 -0500
Subject: [PATCH] Only initialize logging once

---
 src/emulator.cpp | 5 ++---
 src/main.cpp     | 7 +------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/emulator.cpp b/src/emulator.cpp
index 8cb5bcd2a..8a4ea0ab1 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -271,10 +271,9 @@ void Emulator::Run(std::filesystem::path file, std::vector<std::string> args,
     }
 
     game_info.game_folder = game_folder;
-    EmulatorSettings.Load(id);
-
-    Common::Log::Shutdown();
+    
     // Initialize logging as soon as possible
+    EmulatorSettings.Load(id);
     Common::Log::Setup((!id.empty() && EmulatorSettings.IsLogSeparate()) ? id + ".log"
                                                                          : "shad_log.txt");
 
diff --git a/src/main.cpp b/src/main.cpp
index d30a64260..363e3197f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -103,9 +103,6 @@ int main(int argc, char* argv[]) {
     if (waitPid)
         Core::Debugger::WaitForPid(*waitPid);
 
-    // Start default log
-    Common::Log::Setup("shad_log.txt");
-
     IPC::Instance().Init();
 
     auto emu_state = std::make_shared<EmulatorState>();
@@ -121,10 +118,8 @@ int main(int argc, char* argv[]) {
     EmulatorSettingsImpl::SetInstance(emu_settings);
     emu_settings->Load();
 
-    Common::Log::Shutdown();
-    // Start configured log
+    // Configure logger appropriately
     Common::Log::g_should_append |= EmulatorSettings.IsLogAppend();
-    Common::Log::Setup("shad_log.txt");
 
     if (bigPicture) {
         BigPictureMode::Launch(argv[0]);