Merge pull request #3539 from Sonicadvance1/two_adapters_one_pc

Allow multiple GC adapters on one PC to be used with multiple Dolphin instances.
2016-01-20 22:41:19 +01:00 · 2016-01-20 22:41:19 +01:00 · 3a12dccac7
parent a14c07413f 70aa012fef
commit 3a12dccac7
1 changed files with 4 additions and 0 deletions
--- a/Source/Core/InputCommon/GCAdapter.cpp
+++ b/Source/Core/InputCommon/GCAdapter.cpp
@ -190,7 +190,11 @@ void Setup()
 	{
 		libusb_device* device = list[d];
 		if (CheckDeviceAccess(device))
+		{
+			// Only connect to a single adapter in case the user has multiple connected
 			AddGCAdapter(device);
+			break;
+		}
 	}

 	libusb_free_device_list(list, 1);