diff -r 0c231b5184c5 -r 8bba7492558d QTfrontend/util/SDLInteraction.cpp --- a/QTfrontend/util/SDLInteraction.cpp Tue Apr 30 22:43:48 2019 +0200 +++ b/QTfrontend/util/SDLInteraction.cpp Wed May 01 00:09:01 2019 +0200 @@ -50,14 +50,25 @@ m_musicTrack = ""; m_isPlayingMusic = false; lastchannel = 0; + int i; + // Initialize sdlkeys_iskeyboard + for (i=0; i<1024; i++) { + // First 7 entries are mouse buttons (see sdlkeys.cpp) + if ((i > 6) && (sdlkeys[i][0][0] != '\0')) + sdlkeys_iskeyboard[i] = true; + else + sdlkeys_iskeyboard[i] = false; + } + if(SDL_NumJoysticks()) addGameControllerKeys(); - int i = 0; + // Add special "none" key at the end of list + i = 0; while(i < 1024 && sdlkeys[i][1][0] != '\0') i++; sprintf(sdlkeys[i][0], "none"); - sprintf(sdlkeys[i++][1], "%s", HWApplication::translate("binds (keys)", unboundcontrol).toUtf8().constData()); + sprintf(sdlkeys[i][1], "%s", HWApplication::translate("binds (keys)", unboundcontrol).toUtf8().constData()); SDL_QuitSubSystem(SDL_INIT_JOYSTICK);