ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix crash when closing multiplayer windows

This commit is contained in:
Jeffrey Pfau 2015-12-01 21:55:07 -08:00
parent 78acb25afc
commit 9590b484c7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -38,6 +38,7 @@ Bugfixes:
- ARM7: Fix STRT/STRBT - ARM7: Fix STRT/STRBT
- ARM7: Implement undefined STRH/LDRH/LDRSH/LDRSB versions - ARM7: Implement undefined STRH/LDRH/LDRSH/LDRSB versions
- ARM7: Fix bank switching with LDR[B]T/STR[B]T - ARM7: Fix bank switching with LDR[B]T/STR[B]T
- Qt: Fix crash when closing multiplayer windows
Misc: Misc:
- Qt: Window size command line options are now supported - Qt: Window size command line options are now supported
- Qt: Increase usability of key mapper - Qt: Increase usability of key mapper

3
src/platform/qt/InputController.cpp
View File

@ -91,8 +91,7 @@ void InputController::setConfiguration(ConfigController* config) {
#ifdef BUILD_SDL #ifdef BUILD_SDL
GBASDLEventsLoadConfig(&s_sdlEvents, config->input()); GBASDLEventsLoadConfig(&s_sdlEvents, config->input());
if (!m_playerAttached) { if (!m_playerAttached) {
GBASDLAttachPlayer(&s_sdlEvents, &m_sdlPlayer); m_playerAttached = GBASDLAttachPlayer(&s_sdlEvents, &m_sdlPlayer);
m_playerAttached = true;
} }
loadConfiguration(SDL_BINDING_BUTTON); loadConfiguration(SDL_BINDING_BUTTON);
loadProfile(SDL_BINDING_BUTTON, profileForType(SDL_BINDING_BUTTON)); loadProfile(SDL_BINDING_BUTTON, profileForType(SDL_BINDING_BUTTON));