DataHearth/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4627 from Morph1984/fix-dinput-controller-disconnect

Browse Source 
sdl_impl: Erase the SDLJoystick entry after removing a controller
This commit is contained in:
bunnei 2020-10-20 11:40:06 -07:00 committed by GitHub
commit e03dc4d569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/input_common/sdl/sdl_impl.cpp
View File

@ -273,21 +273,19 @@ void SDLState::InitJoystick(int joystick_index) {
void SDLState::CloseJoystick(SDL_Joystick* sdl_joystick) { void SDLState::CloseJoystick(SDL_Joystick* sdl_joystick) {
const std::string guid = GetGUID(sdl_joystick); const std::string guid = GetGUID(sdl_joystick);
std::shared_ptr<SDLJoystick> found_joystick;
{
std::lock_guard lock{joystick_map_mutex}; std::lock_guard lock{joystick_map_mutex};
// This call to guid is safe since the joystick is guaranteed to be in the map auto& joystick_guid_list = joystick_map[guid];
const auto& joystick_guid_list = joystick_map[guid]; auto joystick_it = std::find_if(
const auto joystick_it = std::find_if(joystick_guid_list.begin(), joystick_guid_list.end(), joystick_guid_list.begin(), joystick_guid_list.end(),
[&sdl_joystick](const auto& joystick) { [&sdl_joystick](auto& joystick) { return joystick->GetSDLJoystick() == sdl_joystick; });
return joystick->GetSDLJoystick() == sdl_joystick;
});
found_joystick = *joystick_it;
}
// Destruct SDL_Joystick outside the lock guard because SDL can internally call the if (joystick_it != joystick_guid_list.end()) {
// event callback which locks the mutex again. (*joystick_it)->SetSDLJoystick(nullptr, nullptr);
found_joystick->SetSDLJoystick(nullptr, nullptr); joystick_guid_list.erase(joystick_it);
if (joystick_guid_list.empty()) {
joystick_map.erase(guid);
}
}
} }
void SDLState::HandleGameControllerEvent(const SDL_Event& event) { void SDLState::HandleGameControllerEvent(const SDL_Event& event) {