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

CORE: Allow ApplySettings to be called on the core thread during emulation 

Needed for CDVD to apply gamefixes after a disc swap
This commit is contained in:
TheLastRar 2021-01-10 12:51:03 +00:00 committed by refractionpcsx2
parent 5826be9a74
commit e649ad8241
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/System/SysCoreThread.cpp
View File

@ -167,7 +167,7 @@ void SysCoreThread::ApplySettings(const Pcsx2Config& src)
if (src == EmuConfig)
return;
if (!pxAssertDev(IsPaused(), "CoreThread is not paused; settings cannot be applied."))
if (!pxAssertDev(IsPaused() | IsSelf(), "CoreThread is not paused; settings cannot be applied."))
return;
m_resetRecompilers = (src.Cpu != EmuConfig.Cpu) || (src.Gamefixes != EmuConfig.Gamefixes) || (src.Speedhacks != EmuConfig.Speedhacks);

2
pcsx2/gui/AppCoreThread.cpp
View File

@ -553,7 +553,7 @@ void AppCoreThread::ApplySettings(const Pcsx2Config& src)
if (fixup == EmuConfig)
return;
if (m_ExecMode >= ExecMode_Opened)
if (m_ExecMode >= ExecMode_Opened && !IsSelf())
{
ScopedCoreThreadPause paused_core;
_parent::ApplySettings(fixup);