Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved resilience to buggy controller drivers which could previously crash the application

Browse source
This commit is contained in:
Leon Styhre 2023-10-07 14:03:17 +02:00
parent ebf8f53362
commit ce171b2e17
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
es-core/src/InputManager.cpp
View file

@ -641,6 +641,16 @@ void InputManager::addControllerByDeviceIndex(Window* window, int deviceIndex)
SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), &guid[0], 64); SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), &guid[0], 64);
guid.erase(guid.find('\0')); guid.erase(guid.find('\0'));
if (guid.substr(0, 32) == "00000000000000000000000000000000") {
// This can occur if there are SDL bugs or controller driver bugs.
LOG(LogWarning)
<< "Attempted to add an invalid controller entry with zero GUID, buggy drivers?";
SDL_GameControllerClose(controller);
mControllers.erase(mControllers.find(joyID));
mJoysticks.erase(mJoysticks.find(joyID));
return;
}
mInputConfigs[joyID] = mInputConfigs[joyID] =
std::make_unique<InputConfig>(joyID, SDL_GameControllerName(mControllers[joyID]), guid); std::make_unique<InputConfig>(joyID, SDL_GameControllerName(mControllers[joyID]), guid);