From e40c2f97f02b8e8c2ad38b23227a1ed6789bf286 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Thu, 6 Jan 2022 17:51:35 +1000
Subject: [PATCH] SysThreadBase: Fix double init of SPU2 etc

---
 pcsx2/System/SysThreadBase.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pcsx2/System/SysThreadBase.cpp b/pcsx2/System/SysThreadBase.cpp
index 1bf651c589..291f7ecb8e 100644
--- a/pcsx2/System/SysThreadBase.cpp
+++ b/pcsx2/System/SysThreadBase.cpp
@@ -333,15 +333,11 @@ bool SysThreadBase::StateCheckInThread()
 			if (m_ExecMode != ExecMode_Closing)
 			{
 #ifndef PCSX2_CORE
-				if (g_CDVDReset)
-					// AppCoreThread deals with Reseting CDVD
-					// Reinit all but GS, USB, DEV9, CDVD (just like with isSuspend = false previously)
-					OnResumeInThread(static_cast<SystemsMask>(~(System_GS|System_USB|System_DEV9|System_CDVD)));
-				else
-					// Reinit previously torn down systems
-					OnResumeInThread(systemsToTearDown);
-					
+				// AppCoreThread deals with Reseting CDVD
+				OnResumeInThread(g_CDVDReset ? static_cast<SystemsMask>(systemsToTearDown & ~(System_CDVD)) : systemsToTearDown);
 				g_CDVDReset = false;
+#else
+				OnResumeInThread(systemsToTearDown);
 #endif
 				break;
 			}