close controllers on shutdown #61

Author: OpenFunscripter

OFS-lib/OFS_ControllerInput.cpp

@@ -40,10 +40,10 @@ void ControllerInput::CloseController() noexcept
         isConnected = false;
         if (haptic) {
             SDL_HapticClose(haptic);
-            haptic = 0;
+            haptic = nullptr;
         }
         SDL_GameControllerClose(gamepad);
-        gamepad = 0;
+        gamepad = nullptr;
     }
 }
 
@@ -119,4 +119,11 @@ void ControllerInput::UpdateControllers() noexcept
             controller.Update();
         }
     }
+}
+
+void ControllerInput::Shutdown() noexcept
+{
+    for (auto& controller : Controllers) {
+        controller.CloseController();
+    }
 }

OFS-lib/OFS_ControllerInput.h

@@ -28,6 +28,7 @@ class ControllerInput {
 
     void Init() noexcept;
     void Update() noexcept;
+    void Shutdown() noexcept;
 
     static void UpdateControllers() noexcept;
 

src/OpenFunscripter.cpp

@@ -1713,6 +1713,7 @@ void OpenFunscripter::Shutdown() noexcept
     OFS_FileLogger::Shutdown();
     webApi->Shutdown();
 
+    controllerInput->Shutdown();
     SDL_GL_DeleteContext(glContext);
     SDL_DestroyWindow(window);
     SDL_Quit();