limit Dinput devices to the max supported in input_state and update t…

…he native submodule to get the MAX_NUM_PADS constant
dos1 · Jun 1, 2014 · 5e34dbf · 5e34dbf
1 parent 46eb74e
commit 5e34dbf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Windows/DinputDevice.cpp b/Windows/DinputDevice.cpp
@@ -143,8 +143,13 @@ DinputDevice::DinputDevice(int devnum) {
 		return;
 	}
 
+	if (devnum >= MAX_NUM_PADS)
+	{
+		return;
+	}
+
 	getDevices();
-	if ( (devnum > devices.size()) || FAILED(getPDI()->CreateDevice(devices.at(devnum).guidInstance, &pJoystick, NULL)))
+	if ( (devnum >= devices.size()) || FAILED(getPDI()->CreateDevice(devices.at(devnum).guidInstance, &pJoystick, NULL)))
 	{
 		return;
 	}

diff --git a/native b/native