From a1c4077d83663282e1efd15b6fdc0e102bb95444 Mon Sep 17 00:00:00 2001
From: Gauvain 'GovanifY' Roussel-Tarbouriech <gauvain@govanify.com>
Date: Wed, 4 Nov 2020 18:21:36 +0100
Subject: [PATCH] USB: fix resume issues with wheels and unneeded init

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

diff --git a/pcsx2/System/SysCoreThread.cpp b/pcsx2/System/SysCoreThread.cpp
index d3d7660b4e..7a1b001c49 100644
--- a/pcsx2/System/SysCoreThread.cpp
+++ b/pcsx2/System/SysCoreThread.cpp
@@ -316,11 +316,13 @@ void SysCoreThread::OnResumeInThread(bool isSuspended)
 {
 	GetCorePlugins().Open();
 	if (isSuspended)
+	{
 		DoCDVDopen();
+		DEV9open((void*)pDsp);
+		USBopen((void*)pDsp);
+	}
 	FWopen();
 	SPU2open((void*)pDsp);
-	DEV9open((void*)pDsp);
-	USBopen((void*)pDsp);
 }
 
 
diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp
index d889b9b735..cfe8a4fc7d 100644
--- a/pcsx2/gui/AppCoreThread.cpp
+++ b/pcsx2/gui/AppCoreThread.cpp
@@ -172,7 +172,6 @@ void AppCoreThread::Resume()
 
 	GetCorePlugins().Init();
 	SPU2init();
-    USBinit();
 	_parent::Resume();
 }