all repos — mgba @ 46d31796df3e6aac3ce965262a779f6f715553b9

mGBA Game Boy Advance Emulator

Qt: Fix controllers sometimes not loading the right profile
Jeffrey Pfau jeffrey@endrift.com
Tue, 21 Apr 2015 20:35:35 -0700
commit

46d31796df3e6aac3ce965262a779f6f715553b9

parent

d0e1a5d5d2383a3e1a423fdcccc333b7c7302cca

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

jump to
M CHANGESCHANGES

@@ -16,6 +16,7 @@ - GBA Memory: Allow SRAM to be 64kB

- Qt: Fix controller axis querying - GBA Memory: Fix 32-bit loads from unaddress cartridge space - Qt: Fix multiplayer windows opening as the wrong size + - Qt: Fix controllers sometimes not loading the right profile Misc: - Qt: Show multiplayer numbers in window title - Qt: Solar sensor can have shortcuts set
M src/platform/qt/InputController.cppsrc/platform/qt/InputController.cpp

@@ -90,6 +90,11 @@ }

void InputController::loadConfiguration(uint32_t type) { GBAInputMapLoad(&m_inputMap, type, m_config->input()); +#ifdef BUILD_SDL + if (m_playerAttached) { + GBASDLPlayerLoadConfig(&m_sdlPlayer, m_config->input()); + } +#endif } void InputController::loadProfile(uint32_t type, const QString& profile) {