piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2024-11-15 05:47:43 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix potential crashes in input config dialog when setting joystick buttons, by using uiQueueMain()

Browse Source 
how could I not think of this? GTK is not thread safe.
This commit is contained in:
StapleButter 2018-12-29 23:32:58 +01:00
parent 5c5146945c
commit 65c27c5c28
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/libui_sdl/DlgInputConfig.cpp
View File

@ -165,6 +165,21 @@ int OnAreaKeyEvent(uiAreaHandler* handler, uiArea* area, uiAreaKeyEvent* evt)
return 1;
}
void FinishJoyMapping(void* param)
{
InputDlgData* dlg = (InputDlgData*)param;
int id = dlg->pollid & 0xFF;
char keyname[16];
JoyMappingName(dlg->joymap[id], keyname);
uiButtonSetText(dlg->pollbtn, keyname);
uiControlEnable(uiControl(dlg->pollbtn));
dlg->pollid = -1;
uiControlSetFocus(uiControl(dlg->pollbtn));
}
Uint32 JoyPoll(Uint32 interval, void* param)
{
InputDlgData* dlg = (InputDlgData*)param;
@ -184,15 +199,7 @@ Uint32 JoyPoll(Uint32 interval, void* param)
if (SDL_JoystickGetButton(joy, i))
{
dlg->joymap[id] = i;
char keyname[16];
JoyMappingName(dlg->joymap[id], keyname);
uiButtonSetText(dlg->pollbtn, keyname);
uiControlEnable(uiControl(dlg->pollbtn));
dlg->pollid = -1;
uiControlSetFocus(uiControl(dlg->pollbtn));
uiQueueMain(FinishJoyMapping, dlg);
return 0;
}
}
@ -206,15 +213,7 @@ Uint32 JoyPoll(Uint32 interval, void* param)
else blackhat = 0x8;
dlg->joymap[id] = 0x100 | blackhat;
char keyname[16];
JoyMappingName(dlg->joymap[id], keyname);
uiButtonSetText(dlg->pollbtn, keyname);
uiControlEnable(uiControl(dlg->pollbtn));
dlg->pollid = -1;
uiControlSetFocus(uiControl(dlg->pollbtn));
uiQueueMain(FinishJoyMapping, dlg);
return 0;
}