From 6df4fea0793b98183caf03b5e899f395592d7eb6 Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Fri, 11 Dec 2020 04:08:41 +0100 Subject: [PATCH] PAD: implement lifecycle callbacks --- pcsx2/System/SysCoreThread.cpp | 5 +++++ pcsx2/gui/AppCoreThread.cpp | 1 + 2 files changed, 6 insertions(+) diff --git a/pcsx2/System/SysCoreThread.cpp b/pcsx2/System/SysCoreThread.cpp index b15d16a2e4..fcbb9206a8 100644 --- a/pcsx2/System/SysCoreThread.cpp +++ b/pcsx2/System/SysCoreThread.cpp @@ -96,6 +96,7 @@ void SysCoreThread::Start() return; GetCorePlugins().Init(); SPU2init(); + PADinit(); DEV9init(); USBinit(); _parent::Start(); @@ -311,6 +312,7 @@ void SysCoreThread::OnSuspendInThread() USBclose(); DoCDVDclose(); FWclose(); + PADclose(); SPU2close(); } @@ -325,6 +327,7 @@ void SysCoreThread::OnResumeInThread(bool isSuspended) } FWopen(); SPU2open((void*)pDsp); + PADopen(); } @@ -341,6 +344,7 @@ void SysCoreThread::OnCleanupInThread() vu1Thread.WaitVU(); USBclose(); SPU2close(); + PADclose(); DEV9close(); DoCDVDclose(); FWclose(); @@ -348,6 +352,7 @@ void SysCoreThread::OnCleanupInThread() GetCorePlugins().Shutdown(); USBshutdown(); SPU2shutdown(); + PADshutdown(); DEV9shutdown(); _mm_setcsr(m_mxcsr_saved.bitmask); diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp index b058badcd8..84aaca7a68 100644 --- a/pcsx2/gui/AppCoreThread.cpp +++ b/pcsx2/gui/AppCoreThread.cpp @@ -173,6 +173,7 @@ void AppCoreThread::Resume() GetCorePlugins().Init(); SPU2init(); + PADinit(); _parent::Resume(); }