From cebb4d84f2a8021a5df2ff2a9d31eba16e1cb5e5 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Tue, 11 Oct 2016 12:41:29 -0700 Subject: [PATCH] ControllerInterface: clear devices before shutting down backends The SDL backend faults if it tries to close a joystick after SDL_Quit has been called. --- .../ControllerInterface.cpp | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index c6f250a157..13873ac2dd 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -102,6 +102,19 @@ void ControllerInterface::Shutdown() if (!m_is_init) return; + { + std::lock_guard lk(m_devices_mutex); + + for (const auto& d : m_devices) + { + // Set outputs to ZERO before destroying device + for (ciface::Core::Device::Output* o : d->Outputs()) + o->SetState(0); + } + + m_devices.clear(); + } + #ifdef CIFACE_USE_XINPUT ciface::XInput::DeInit(); #endif @@ -126,17 +139,6 @@ void ControllerInterface::Shutdown() ciface::evdev::Shutdown(); #endif - std::lock_guard lk(m_devices_mutex); - - for (const auto& d : m_devices) - { - // Set outputs to ZERO before destroying device - for (ciface::Core::Device::Output* o : d->Outputs()) - o->SetState(0); - } - - m_devices.clear(); - m_is_init = false; }