From 5826be9a74eeed441bce807d6d584a5ccc6a0bf0 Mon Sep 17 00:00:00 2001
From: TheLastRar <alastairbarnes123@hotmail.com>
Date: Sat, 9 Jan 2021 16:37:36 +0000
Subject: [PATCH] Core: Attempt to fix CDVD regression

---
 pcsx2/System/SysCoreThread.cpp | 1 -
 pcsx2/System/SysThreadBase.cpp | 4 +++-
 pcsx2/gui/AppCoreThread.cpp    | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pcsx2/System/SysCoreThread.cpp b/pcsx2/System/SysCoreThread.cpp
index 940a8a16f4..d24a5fa644 100644
--- a/pcsx2/System/SysCoreThread.cpp
+++ b/pcsx2/System/SysCoreThread.cpp
@@ -326,7 +326,6 @@ void SysCoreThread::OnResumeInThread(bool isSuspended)
 	GetCorePlugins().Open();
 	if (isSuspended)
 	{
-		DoCDVDopen();
 		DEV9open((void*)pDsp);
 		USBopen((void*)pDsp);
 	}
diff --git a/pcsx2/System/SysThreadBase.cpp b/pcsx2/System/SysThreadBase.cpp
index 24fe738dd9..5b200c3816 100644
--- a/pcsx2/System/SysThreadBase.cpp
+++ b/pcsx2/System/SysThreadBase.cpp
@@ -332,7 +332,9 @@ bool SysThreadBase::StateCheckInThread()
 			if (m_ExecMode != ExecMode_Closing)
 			{
 				if (g_CDVDReset)
-					DoCDVDopen();
+					//AppCoreThread deals with Reseting CDVD
+					OnResumeInThread(false);
+					
 				g_CDVDReset = false;
 				break;
 			}
diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp
index 454af5a75b..c62a6c8c43 100644
--- a/pcsx2/gui/AppCoreThread.cpp
+++ b/pcsx2/gui/AppCoreThread.cpp
@@ -585,8 +585,11 @@ void AppCoreThread::OnResumeInThread(bool isSuspended)
 	{
 		CDVDsys_ChangeSource(g_Conf->CdvdSource);
 		cdvdCtrlTrayOpen();
+		DoCDVDopen();
 		m_resetCdvd = false;
 	}
+	else if (isSuspended)
+		DoCDVDopen();
 
 	_parent::OnResumeInThread(isSuspended);
 	PostCoreStatus(CoreThread_Resumed);