ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jonathan Li 2016-05-06 00:21:34 +01:00
parent 055b9c57e7
commit f97b556e23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/gui/AppCoreThread.cpp
View File

@ -373,7 +373,7 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src )
gameMemCardFilter = game.getString("MemCardFilter"); gameMemCardFilter = game.getString("MemCardFilter");
} }
if (EmuConfig.EnablePatches) if (fixup.EnablePatches)
{ {
if (int patches = InitPatches(gameCRC, game)) if (int patches = InitPatches(gameCRC, game))
{ {
@ -410,11 +410,11 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src )
} }
// regular cheat patches // regular cheat patches
if (EmuConfig.EnableCheats) if (fixup.EnableCheats)
gameCheats.Printf(L" [%d Cheats]", LoadCheats(gameCRC, GetCheatsFolder(), L"Cheats")); gameCheats.Printf(L" [%d Cheats]", LoadCheats(gameCRC, GetCheatsFolder(), L"Cheats"));
// wide screen patches // wide screen patches
if (EmuConfig.EnableWideScreenPatches) if (fixup.EnableWideScreenPatches)
{ {
if (int numberLoadedWideScreenPatches = LoadCheats(gameCRC, GetCheatsWsFolder(), L"Widescreen hacks")) if (int numberLoadedWideScreenPatches = LoadCheats(gameCRC, GetCheatsWsFolder(), L"Widescreen hacks"))
{ {