encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks

This commit is contained in:
Sam Lantinga 2022-09-26 14:39:51 -07:00
parent 39adcc0a6b
commit b7fddb4c0e
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/joystick/hidapi/SDL_hidapi_ps4.c
View File

@ -958,8 +958,8 @@ HIDAPI_DriverPS4_UpdateDevice(SDL_HIDAPI_Device *device)
int packet_count = 0; int packet_count = 0;
/* Reconnect the Bluetooth device once the USB device is gone */ /* Reconnect the Bluetooth device once the USB device is gone */
if (device->is_bluetooth && if (device->num_joysticks == 0 &&
device->num_joysticks == 0 && device->is_bluetooth &&
!HIDAPI_HasConnectedUSBDevice(device->serial)) { !HIDAPI_HasConnectedUSBDevice(device->serial)) {
HIDAPI_JoystickConnected(device, NULL); HIDAPI_JoystickConnected(device, NULL);
} }

4
src/joystick/hidapi/SDL_hidapi_ps5.c
View File

@ -1266,8 +1266,8 @@ HIDAPI_DriverPS5_UpdateDevice(SDL_HIDAPI_Device *device)
int packet_count = 0; int packet_count = 0;
/* Reconnect the Bluetooth device once the USB device is gone */ /* Reconnect the Bluetooth device once the USB device is gone */
if (device->is_bluetooth && if (device->num_joysticks == 0 &&
device->num_joysticks == 0 && device->is_bluetooth &&
!HIDAPI_HasConnectedUSBDevice(device->serial)) { !HIDAPI_HasConnectedUSBDevice(device->serial)) {
HIDAPI_JoystickConnected(device, NULL); HIDAPI_JoystickConnected(device, NULL);
} }

4
src/joystick/hidapi/SDL_hidapi_switch.c
View File

@ -2077,8 +2077,8 @@ HIDAPI_DriverSwitch_UpdateDevice(SDL_HIDAPI_Device *device)
Uint32 now; Uint32 now;
/* Reconnect the Bluetooth device once the USB device is gone */ /* Reconnect the Bluetooth device once the USB device is gone */
if (device->is_bluetooth && if (device->num_joysticks == 0 &&
device->num_joysticks == 0 && device->is_bluetooth &&
!HIDAPI_HasConnectedUSBDevice(device->serial)) { !HIDAPI_HasConnectedUSBDevice(device->serial)) {
HIDAPI_JoystickConnected(device, NULL); HIDAPI_JoystickConnected(device, NULL);
} }

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

@ -535,6 +535,10 @@ HIDAPI_HasConnectedUSBDevice(const char *serial)
SDL_HIDAPI_Device *device; SDL_HIDAPI_Device *device;
for (device = SDL_HIDAPI_devices; device; device = device->next) { for (device = SDL_HIDAPI_devices; device; device = device->next) {
if (!device->driver) {
continue;
}
if (device->is_bluetooth) { if (device->is_bluetooth) {
continue; continue;
} }
@ -552,6 +556,10 @@ HIDAPI_DisconnectBluetoothDevice(const char *serial)
SDL_HIDAPI_Device *device; SDL_HIDAPI_Device *device;
for (device = SDL_HIDAPI_devices; device; device = device->next) { for (device = SDL_HIDAPI_devices; device; device = device->next) {
if (!device->driver) {
continue;
}
if (!device->is_bluetooth) { if (!device->is_bluetooth) {
continue; continue;
} }