Commit 30b4d90f1cfb9717bbc816987e779671f590b042
2023-06-09T17:34:12
Only update the serial number if it hasn't already been set 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 2042e9c4e3cba6ffa9c34abac14828e31365f98b)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index 2e7d605..de9443a 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -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);
}