reassign freed up controller indices on disconnection

fallahn · Sep 14, 2024 · c35431e · c35431e
1 parent a6f5230
commit c35431e
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/crogine/src/core/App.cpp b/crogine/src/core/App.cpp
@@ -890,7 +890,15 @@ void App::handleEvents()
                 }
 
                 SDL_GameControllerClose(m_controllers[controllerIndex].controller);
-                m_controllers[controllerIndex] = {};
+                //m_controllers[controllerIndex] = {};
+
+                m_controllers[controllerIndex] = m_controllers[m_controllerCount];
+                m_controllers[m_controllerCount] = {};
+
+                if (m_controllers[controllerIndex].controller)
+                {
+                    SDL_GameControllerSetPlayerIndex(m_controllers[controllerIndex].controller, controllerIndex);
+                }
             }
 
             if (m_joysticks.count(id) > 0)