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

Core: Attempt to fix CDVD regression

This commit is contained in:
TheLastRar 2021-01-09 16:37:36 +00:00 committed by refractionpcsx2
parent 406403cd8e
commit 5826be9a74
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/System/SysCoreThread.cpp
View File

@ -326,7 +326,6 @@ void SysCoreThread::OnResumeInThread(bool isSuspended)
GetCorePlugins().Open(); GetCorePlugins().Open();
if (isSuspended) if (isSuspended)
{ {
DoCDVDopen();
DEV9open((void*)pDsp); DEV9open((void*)pDsp);
USBopen((void*)pDsp); USBopen((void*)pDsp);
} }

4
pcsx2/System/SysThreadBase.cpp
View File

@ -332,7 +332,9 @@ bool SysThreadBase::StateCheckInThread()
if (m_ExecMode != ExecMode_Closing) if (m_ExecMode != ExecMode_Closing)
{ {
if (g_CDVDReset) if (g_CDVDReset)
DoCDVDopen(); //AppCoreThread deals with Reseting CDVD
OnResumeInThread(false);
g_CDVDReset = false; g_CDVDReset = false;
break; break;
} }

3
pcsx2/gui/AppCoreThread.cpp
View File

@ -585,8 +585,11 @@ void AppCoreThread::OnResumeInThread(bool isSuspended)
{ {
CDVDsys_ChangeSource(g_Conf->CdvdSource); CDVDsys_ChangeSource(g_Conf->CdvdSource);
cdvdCtrlTrayOpen(); cdvdCtrlTrayOpen();
DoCDVDopen();
m_resetCdvd = false; m_resetCdvd = false;
} }
else if (isSuspended)
DoCDVDopen();
_parent::OnResumeInThread(isSuspended); _parent::OnResumeInThread(isSuspended);
PostCoreStatus(CoreThread_Resumed); PostCoreStatus(CoreThread_Resumed);