encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-06-11 00:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when extension controllers are hotplugged

Browse Source
This commit is contained in:
Sam Lantinga 2022-09-02 11:41:19 -07:00
parent 7df571ffc6
commit 5002624e8a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/joystick/hidapi/SDL_hidapi_wii.c
View File

@ -125,6 +125,7 @@ typedef struct {
Uint8 m_rgucReadBuffer[k_unWiiPacketDataLength]; Uint8 m_rgucReadBuffer[k_unWiiPacketDataLength];
Uint32 m_unLastInput; Uint32 m_unLastInput;
Uint32 m_unLastStatus; Uint32 m_unLastStatus;
SDL_bool m_bDisconnected;
struct StickCalibrationData { struct StickCalibrationData {
Uint16 min; Uint16 min;
@ -210,7 +211,7 @@ static SDL_bool WriteOutput(SDL_DriverWii_Context *ctx, const Uint8 *data, int s
static SDL_bool ReadInputSync(SDL_DriverWii_Context *ctx, EWiiInputReportIDs expectedID, SDL_bool(*isMine)(const Uint8 *)) static SDL_bool ReadInputSync(SDL_DriverWii_Context *ctx, EWiiInputReportIDs expectedID, SDL_bool(*isMine)(const Uint8 *))
{ {
Uint32 TimeoutMs = 100; Uint32 TimeoutMs = 250; /* Seeing successful reads after about 200 ms */
Uint32 startTicks = SDL_GetTicks(); Uint32 startTicks = SDL_GetTicks();
int nRead = 0; int nRead = 0;
@ -1003,7 +1004,7 @@ static void HandleStatus(SDL_DriverWii_Context *ctx, SDL_Joystick *joystick)
SendExtensionIdentify1(ctx, SDL_FALSE); SendExtensionIdentify1(ctx, SDL_FALSE);
} else if (hadExtension) { } else if (hadExtension) {
/* Mark this controller as disconnected so we re-connect with a new identity */ /* Mark this controller as disconnected so we re-connect with a new identity */
HIDAPI_JoystickDisconnected(ctx->device, joystick->instance_id); ctx->m_bDisconnected = SDL_TRUE;
} }
} }
@ -1057,7 +1058,7 @@ static void HandleResponse(SDL_DriverWii_Context *ctx, SDL_Joystick *joystick)
ctx->m_eCommState = k_eWiiCommunicationState_None; ctx->m_eCommState = k_eWiiCommunicationState_None;
if (exctype != ctx->m_eExtensionControllerType) { if (exctype != ctx->m_eExtensionControllerType) {
/* Mark this controller as disconnected so we re-connect with a new identity */ /* Mark this controller as disconnected so we re-connect with a new identity */
HIDAPI_JoystickDisconnected(ctx->device, joystick->instance_id); ctx->m_bDisconnected = SDL_TRUE;
} }
} else { } else {
char msg[512]; char msg[512];
@ -1211,7 +1212,7 @@ HIDAPI_DriverWii_UpdateDevice(SDL_HIDAPI_Device *device)
} }
} }
if (size < 0) { if (size < 0 || ctx->m_bDisconnected) {
/* Read error, device is disconnected */ /* Read error, device is disconnected */
HIDAPI_JoystickDisconnected(device, joystick->instance_id); HIDAPI_JoystickDisconnected(device, joystick->instance_id);
} }