You can get window events after shutting down the window, so don't ab…

…ort the program if that happens.
libsdl-org · Dec 11, 2012 · de52fa2 · de52fa2
1 parent 8f2299d
commit de52fa2
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/test/testjoystick.c b/test/testjoystick.c
@@ -250,11 +250,17 @@ main(int argc, char *argv[])
                 SDL_JoystickClose(joystick);
             }
 
+            joystick = NULL;
             if (keepGoing) {
-                joystick = NULL;
-                SDL_WaitEvent( &event );
-                if ( event.type == SDL_JOYDEVICEADDED ) {
+                printf("Waiting for attach\n");
+            }
+            while (keepGoing) {
+                SDL_WaitEvent(&event);
+                if (event.type == SDL_QUIT) {
+                    keepGoing = SDL_FALSE;
+                } else if (event.type == SDL_JOYDEVICEADDED) {
                     joystick = SDL_JoystickOpen(atoi(argv[1]));
+                    break;
                 }
             }
         }