ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ControllerInterface: clear devices before shutting down backends 

The SDL backend faults if it tries to close a joystick after SDL_Quit
has been called.
This commit is contained in:
Michael Maltese 2016-10-11 12:41:29 -07:00
parent a3d2dead76
commit cebb4d84f2
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View File

@ -102,6 +102,19 @@ void ControllerInterface::Shutdown()
if (!m_is_init)
return;
{
std::lock_guard<std::mutex> 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<std::mutex> 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;
}