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

Qt: Fix merge issue

This commit is contained in:
Vicki Pfau 2021-07-02 03:19:53 -07:00
parent 877135a803
commit 00f1229ea2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform/qt/input/InputController.cpp
View File

@ -159,8 +159,9 @@ void InputController::setPlatform(mPlatform platform) {
loadConfiguration(KEYBOARD); loadConfiguration(KEYBOARD);
#ifdef BUILD_SDL #ifdef BUILD_SDL
mSDLInitBindingsGBA(&m_inputMap); if (!loadConfiguration(SDL_BINDING_BUTTON)) {
loadConfiguration(SDL_BINDING_BUTTON); mSDLInitBindingsGBA(&m_inputMap);
}
#endif #endif
rebuildKeyIndex(); rebuildKeyIndex();
@ -273,9 +274,6 @@ void InputController::setConfiguration(ConfigController* config) {
if (!m_playerAttached) { if (!m_playerAttached) {
m_playerAttached = mSDLAttachPlayer(&s_sdlEvents, &m_sdlPlayer); m_playerAttached = mSDLAttachPlayer(&s_sdlEvents, &m_sdlPlayer);
} }
if (!loadConfiguration(SDL_BINDING_BUTTON)) {
mSDLInitBindingsGBA(&m_inputMap);
}
loadProfile(SDL_BINDING_BUTTON, profileForType(SDL_BINDING_BUTTON)); loadProfile(SDL_BINDING_BUTTON, profileForType(SDL_BINDING_BUTTON));
#endif #endif
restoreModel(); restoreModel();