mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-05 19:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only update the serial number if it hasn't already been set

Browse Source 
This fixes the serial number for Nintendo Switch Pro, which is queried from the hardware in device initialization, and was later clobbered by the USB string which isn't correct.

(cherry picked from commit 2042e9c4e3)
This commit is contained in:
Sam Lantinga
2023-06-09 17:34:12 -07:00
parent 1cdd6dc829
commit 30b4d90f1c
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/joystick/hidapi/SDL_hidapijoystick.c
View File

@@ -676,6 +676,22 @@ static void HIDAPI_UpdateJoystickSerial(SDL_HIDAPI_Device *device)
}
}
static SDL_bool HIDAPI_SerialIsEmpty(SDL_HIDAPI_Device *device)
{
SDL_bool all_zeroes = SDL_TRUE;
if (device->serial) {
const char *serial = device->serial;
for (serial = device->serial; *serial; ++serial) {
if (*serial != '0') {
all_zeroes = SDL_FALSE;
break;
}
}
}
return all_zeroes;
}
void HIDAPI_SetDeviceSerial(SDL_HIDAPI_Device *device, const char *serial)
{
if (serial && *serial && (!device->serial || SDL_strcmp(serial, device->serial) != 0)) {
@@ -1079,7 +1095,9 @@ static void HIDAPI_UpdateDeviceList(void)
device->seen = SDL_TRUE;
/* Check to see if the serial number is available now */
HIDAPI_SetDeviceSerialW(device, info->serial_number);
if(HIDAPI_SerialIsEmpty(device)) {
HIDAPI_SetDeviceSerialW(device, info->serial_number);
}
} else {
HIDAPI_AddDevice(info, 0, NULL);
}