dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-06-04 23:15:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Only initialize logging once

Browse Source
This commit is contained in:
Stephen Miller 2026-06-01 20:44:06 -05:00
parent 6d2e6a439a
commit 4fbd9608f2
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emulator.cpp
View File

@ -271,10 +271,9 @@ void Emulator::Run(std::filesystem::path file, std::vector<std::string> args,
} }
game_info.game_folder = game_folder; game_info.game_folder = game_folder;
EmulatorSettings.Load(id);
Common::Log::Shutdown();
// Initialize logging as soon as possible // Initialize logging as soon as possible
EmulatorSettings.Load(id);
Common::Log::Setup((!id.empty() && EmulatorSettings.IsLogSeparate()) ? id + ".log" Common::Log::Setup((!id.empty() && EmulatorSettings.IsLogSeparate()) ? id + ".log"
: "shad_log.txt"); : "shad_log.txt");

7
src/main.cpp
View File

@ -103,9 +103,6 @@ int main(int argc, char* argv[]) {
if (waitPid) if (waitPid)
Core::Debugger::WaitForPid(*waitPid); Core::Debugger::WaitForPid(*waitPid);
// Start default log
Common::Log::Setup("shad_log.txt");
IPC::Instance().Init(); IPC::Instance().Init();
auto emu_state = std::make_shared<EmulatorState>(); auto emu_state = std::make_shared<EmulatorState>();
@ -121,10 +118,8 @@ int main(int argc, char* argv[]) {
EmulatorSettingsImpl::SetInstance(emu_settings); EmulatorSettingsImpl::SetInstance(emu_settings);
emu_settings->Load(); emu_settings->Load();
Common::Log::Shutdown(); // Configure logger appropriately
// Start configured log
Common::Log::g_should_append |= EmulatorSettings.IsLogAppend(); Common::Log::g_should_append |= EmulatorSettings.IsLogAppend();
Common::Log::Setup("shad_log.txt");
if (bigPicture) { if (bigPicture) {
BigPictureMode::Launch(argv[0]); BigPictureMode::Launch(argv[0]);