Emscripten: Fixed receiving joystick events after failed init or subs…

…ystem quit. The callbacks used to receive the HTML events were not removed if the joystick subsystem initialization failed or if the joystick subsystem was quit. Also, the already connected joysticks were not deleted if the initialization failed later.
libsdl-org · Feb 18, 2015 · 6dda14c · 6dda14c
1 parent f9adb45
commit 6dda14c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/joystick/emscripten/SDL_sysjoystick.c b/src/joystick/emscripten/SDL_sysjoystick.c
@@ -220,13 +220,15 @@ SDL_SYS_JoystickInit(void)
                                                       Emscripten_JoyStickConnected);
 
     if(retval != EMSCRIPTEN_RESULT_SUCCESS) {
+        SDL_SYS_JoystickQuit();
         return -1;
     }
 
     retval = emscripten_set_gamepaddisconnected_callback(NULL,
                                                          0,
                                                          Emscripten_JoyStickDisconnected);
     if(retval != EMSCRIPTEN_RESULT_SUCCESS) {
+        SDL_SYS_JoystickQuit();
         return -1;
     }
 
@@ -399,6 +401,9 @@ SDL_SYS_JoystickQuit(void)
 
     numjoysticks = 0;
     instance_counter = 0;
+
+    emscripten_set_gamepadconnected_callback(NULL, 0, NULL);
+    emscripten_set_gamepaddisconnected_callback(NULL, 0, NULL);
 }
 
 SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID(int index)