Games: Fix crash on game close after controller disconnects

xbmc/games/addons/input/GameClientInput.cpp

@@ -549,10 +549,30 @@ void CGameClientInput::ProcessJoysticks()
   PERIPHERALS::PeripheralVector joysticks;
   CServiceBroker::GetPeripherals().GetPeripheralsWithFeature(joysticks, PERIPHERALS::FEATURE_JOYSTICK);
 
+  // Update expired joysticks
+  PortMap portMapCopy = m_portMap;
+  for (auto& it : portMapCopy)
+  {
+    JOYSTICK::IInputProvider* inputProvider = it.first;
+    CGameClientJoystick* gameJoystick = it.second;
+
+    const bool bExpired = std::find_if(joysticks.begin(), joysticks.end(),
+      [inputProvider](const PERIPHERALS::PeripheralPtr &joystick)
+      {
+        return inputProvider == static_cast<JOYSTICK::IInputProvider*>(joystick.get());
+      }) == joysticks.end();
+
+    if (bExpired)
+    {
+      gameJoystick->UnregisterInput(nullptr);
+      m_portMap.erase(inputProvider);
+    }
+  }
+
   // Perform the port mapping
   PortMap newPortMap = MapJoysticks(joysticks, m_joysticks);
 
-  // Update each joystick
+  // Update connected joysticks
   for (auto& peripheralJoystick : joysticks)
   {
     // Upcast to input interface

xbmc/games/ports/Port.cpp

@@ -40,9 +40,15 @@ void CPort::RegisterInput(JOYSTICK::IInputProvider *provider)
 void CPort::UnregisterInput(JOYSTICK::IInputProvider *provider)
 {
   // Unregister in reverse order
+  if (provider == nullptr)
+    m_appInput->UnregisterInputProvider();
   m_appInput.reset();
-  provider->UnregisterInputHandler(this);
-  provider->UnregisterInputHandler(m_inputSink.get());
+
+  if (provider != nullptr)
+  {
+    provider->UnregisterInputHandler(this);
+    provider->UnregisterInputHandler(m_inputSink.get());
+  }
 }
 
 std::string CPort::ControllerID() const

xbmc/input/joysticks/keymaps/KeymapHandling.cpp

@@ -95,9 +95,11 @@ void CKeymapHandling::LoadKeymaps()
 
 void CKeymapHandling::UnloadKeymaps()
 {
-  for (auto it = m_inputHandlers.rbegin(); it != m_inputHandlers.rend(); ++it)
-    m_inputProvider->UnregisterInputHandler(it->get());
-
+  if (m_inputProvider != nullptr)
+  {
+    for (auto it = m_inputHandlers.rbegin(); it != m_inputHandlers.rend(); ++it)
+      m_inputProvider->UnregisterInputHandler(it->get());
+  }
   m_inputHandlers.clear();
   m_keymaps.clear();
 }

xbmc/input/joysticks/keymaps/KeymapHandling.h

@@ -36,6 +36,15 @@ namespace JOYSTICK
 
     virtual ~CKeymapHandling();
 
+    /*!
+     * \brief Unregister the input provider
+     *
+     * Call this if the input provider is invalidated, such as if a user
+     * disconnects a controller. This prevents accessing the invalidated
+     * input provider when keymaps are unloaded upon destruction.
+     */
+    void UnregisterInputProvider() { m_inputProvider = nullptr; }
+
     /*!
      * \brief
      */
@@ -54,7 +63,7 @@ namespace JOYSTICK
     void UnloadKeymaps();
 
     // Construction parameter
-    IInputProvider *const m_inputProvider;
+    IInputProvider *m_inputProvider;
     const bool m_pPromiscuous;
     const IKeymapEnvironment *const m_environment;