Don't close controller after SDL has quit (#642)

* Don't close controller after SDL has quit * Don't check if controller can rumble if null
HarbourMasters · Jul 11, 2022 · e3267a4 · e3267a4
1 parent 926fd3f
commit e3267a4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/libultraship/libultraship/SDLController.cpp b/libultraship/libultraship/SDLController.cpp
@@ -101,10 +101,10 @@ namespace Ship {
     }
 
     bool SDLController::Close() {
-        if (CanRumble()) {
-            SDL_GameControllerRumble(Cont, 0, 0, 0);
-        }
-        if (Cont != nullptr) {
+        if (Cont != nullptr && SDL_WasInit(SDL_INIT_GAMECONTROLLER)) {
+            if (CanRumble()) {
+                SDL_GameControllerRumble(Cont, 0, 0, 0);
+            }
             SDL_GameControllerClose(Cont);
         }
         Cont = nullptr;