all repos — mgba @ 9590b484c73be4c852082a48912110695853b231

mGBA Game Boy Advance Emulator

Qt: Fix crash when closing multiplayer windows
Jeffrey Pfau jeffrey@endrift.com
Tue, 01 Dec 2015 21:55:07 -0800
commit

9590b484c73be4c852082a48912110695853b231

parent

78acb25afce980b04a627ba4d3bb9aa9a930fa0c

2 files changed, 2 insertions(+), 2 deletions(-)

jump to
M CHANGESCHANGES

@@ -38,6 +38,7 @@ - GBA Memory: Fix DMAs triggering two cycles early

- ARM7: Fix STRT/STRBT - ARM7: Implement undefined STRH/LDRH/LDRSH/LDRSB versions - ARM7: Fix bank switching with LDR[B]T/STR[B]T + - Qt: Fix crash when closing multiplayer windows Misc: - Qt: Window size command line options are now supported - Qt: Increase usability of key mapper
M src/platform/qt/InputController.cppsrc/platform/qt/InputController.cpp

@@ -91,8 +91,7 @@ loadConfiguration(KEYBOARD);

#ifdef BUILD_SDL GBASDLEventsLoadConfig(&s_sdlEvents, config->input()); if (!m_playerAttached) { - GBASDLAttachPlayer(&s_sdlEvents, &m_sdlPlayer); - m_playerAttached = true; + m_playerAttached = GBASDLAttachPlayer(&s_sdlEvents, &m_sdlPlayer); } loadConfiguration(SDL_BINDING_BUTTON); loadProfile(SDL_BINDING_BUTTON, profileForType(SDL_BINDING_BUTTON));