From f97b556e230cae37d5fdad65f9756424d444afb7 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Fri, 6 May 2016 00:21:34 +0100 Subject: [PATCH] pcsx2: Use incoming settings when applying settings The old config settings were wrongly used when determining whether to load patches, cheats and widescreen hacks. These settings needed to be applied twice to actually take effect if they were changed while a game is running. Use the incoming settings so the settings only need to be applied once. --- pcsx2/gui/AppCoreThread.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp index dfc68b80a9..11373dc56b 100644 --- a/pcsx2/gui/AppCoreThread.cpp +++ b/pcsx2/gui/AppCoreThread.cpp @@ -373,7 +373,7 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src ) gameMemCardFilter = game.getString("MemCardFilter"); } - if (EmuConfig.EnablePatches) + if (fixup.EnablePatches) { if (int patches = InitPatches(gameCRC, game)) { @@ -410,11 +410,11 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src ) } // regular cheat patches - if (EmuConfig.EnableCheats) + if (fixup.EnableCheats) gameCheats.Printf(L" [%d Cheats]", LoadCheats(gameCRC, GetCheatsFolder(), L"Cheats")); // wide screen patches - if (EmuConfig.EnableWideScreenPatches) + if (fixup.EnableWideScreenPatches) { if (int numberLoadedWideScreenPatches = LoadCheats(gameCRC, GetCheatsWsFolder(), L"Widescreen hacks")) {