UWP/WinRT: Fix XInput controller detection for late-arriving controllers

Signed-off-by: SternXD <[email protected]>

Author: SternXD

input/drivers_joypad/xinput_hybrid_joypad.c

@@ -611,13 +611,28 @@ static void xinput_joypad_poll(void)
          xinput_hotplug_index = (xinput_hotplug_index + 1) % 4;
    }
 
+   bool has_active_ports = false;
+   for (i = 0; i < 4; ++i)
+   {
+      if (xinput_active_port[i])
+         has_active_ports = true;
+   }
+
    for (i = 0; i < 4; ++i)
    {
       DWORD status;
       bool success, new_connected;
       xinput_joypad_state *state;
+       /* On UWP, controllers may become available after initialization.
+       * If no ports are currently active, we need to poll all ports
+       * to catch any late arriving controllers. */
+#ifdef __WINRT__
+      if (!xinput_active_port[i] && has_active_ports)
+         continue;
+#else
       if (!xinput_active_port[i])
          continue;
+#endif
 
       state         = &g_xinput_states[i];
       status        = g_XInputGetStateEx(i, &state->xstate);

input/drivers_joypad/xinput_joypad.c

@@ -381,13 +381,28 @@ static void xinput_joypad_poll(void)
       xinput_hotplug_index = (xinput_hotplug_index + 1) % 4;
    }
 
+   bool has_active_ports = false;
+   for (i = 0; i < 4; ++i)
+   {
+      if (xinput_active_port[i])
+         has_active_ports = true;
+   }
+
    for (i = 0; i < 4; ++i)
    {
       DWORD status;
       bool success, new_connected;
       xinput_joypad_state *state;
+      /* On UWP, controllers may become available after initialization.
+       * If no ports are currently active, we need to poll all ports
+       * to catch any late arriving controllers. */
+#ifdef __WINRT__
+if (!xinput_active_port[i] && has_active_ports)
+   continue;
+#else
       if (!xinput_active_port[i])
          continue;
+#endif
 
       state          = &g_xinput_states[i];
       status         = g_XInputGetStateEx(i, &state->xstate);