Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-18 04:45:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improved resilience to buggy controller drivers which would sometimes crash the application

Browse source
This commit is contained in:
Leon Styhre 2023-05-06 10:40:36 +02:00
parent 8bc31e2fd8
commit feae03375e
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -626,8 +626,18 @@ void InputManager::addControllerByDeviceIndex(Window* window, int deviceIndex)
mJoysticks[joyID] = joy; mJoysticks[joyID] = joy;
mControllers[joyID] = controller; mControllers[joyID] = controller;
char guid[65]; std::string guid(65, '\0');
SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), guid, 65); SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), &guid[0], 64);
guid.erase(guid.find('\0'));
for (auto& inputConfig : mInputConfigs) {
// This can occur if there are SDL bugs or controller driver bugs.
if (inputConfig.second->getDeviceGUIDString().substr(0, 32) == guid.substr(0, 32)) {
LOG(LogWarning) << "Attempted to add an existing controller entry with GUID \"" << guid
<< "\", buggy drivers?";
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);
@ -668,9 +678,17 @@ void InputManager::removeControllerByJoystickID(Window* window, SDL_JoystickID j
{ {
assert(joyID != -1); assert(joyID != -1);
char guid[65]; std::string guid(65, '\0');
SDL_Joystick* joy {SDL_JoystickFromInstanceID(joyID)}; SDL_Joystick* joy {SDL_JoystickFromInstanceID(joyID)};
SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), guid, 65); SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), &guid[0], 64);
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 remove an invalid controller entry with zero GUID, buggy drivers?";
return;
}
LOG(LogInfo) << "Removed controller \"" << SDL_GameControllerName(mControllers[joyID]) LOG(LogInfo) << "Removed controller \"" << SDL_GameControllerName(mControllers[joyID])
<< "\" (GUID: " << guid << ", instance ID: " << joyID << ")"; << "\" (GUID: " << guid << ", instance ID: " << joyID << ")";