QTfrontend/util/SDLInteraction.cpp
changeset 10248 7b9b44a051f8
parent 10108 c68cf030eded
child 10938 91c75537fba0
--- a/QTfrontend/util/SDLInteraction.cpp	Fri May 23 13:37:34 2014 +0400
+++ b/QTfrontend/util/SDLInteraction.cpp	Wed May 28 09:05:36 2014 +0400
@@ -54,6 +54,7 @@
     m_music = NULL;
     m_musicTrack = "";
     m_isPlayingMusic = false;
+    lastchannel = 0;
     if(SDL_NumJoysticks())
         addGameControllerKeys();
     SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
@@ -175,6 +176,9 @@
         SDL_JoystickClose(joy);
     }
 
+    if(i >= 1024)
+        i = 1023;
+
     // Terminate the list
     sdlkeys[i][0][0] = '\0';
     sdlkeys[i][1][0] = '\0';