From 6689b0be0201cb6a5c198701b9dc6efb9af33d5a Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Fri, 12 Feb 2021 19:50:26 +0300
Subject: Fix XInput hotplug

---
 src/core/re3.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/core/re3.cpp')

diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 7f7f1f83..6de079e8 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -336,6 +336,14 @@ void LoadINIControllerSettings()
 					CPad::XInputJoy2 = i;
 			}
 		}
+
+		// There is no plug event on XInput, so let's leave XInputJoy1/2 as 0/1 respectively, and hotplug will be possible.
+		if (CPad::XInputJoy1 == -1) {
+			CPad::XInputJoy1 = 0;
+			CPad::XInputJoy2 = 1;
+		} else if (CPad::XInputJoy2 == -1) {
+			CPad::XInputJoy2 = (CPad::XInputJoy1 + 1) % 4;
+		}
 	}
 #else
 	ReadIniIfExists("Controller", "JoystickName", gSelectedJoystickName, 128);
-- 
cgit v1.2.3