summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/GCAdapter.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2016-01-20 15:20:17 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2016-01-20 15:20:17 -0600
commit70aa012fefc080d3eff39673cb29725dfd4e0e74 (patch)
tree1b74dcdcfb67f516d232614563ace2f3bc30fcf9 /Source/Core/InputCommon/GCAdapter.cpp
parenta14c07413f3c74a788238c5cd75cd5c6b0de32ac (diff)
Allow multiple GC adapters on one PC to be used with multiple Dolphin instances.
Previously we would iterate through every GC adapter plugged in to the PC and steal ownership of it. This causes issues all over the place in the implementation if this happens. Break on the first adapter we can get access to.
Diffstat (limited to 'Source/Core/InputCommon/GCAdapter.cpp')
-rw-r--r--Source/Core/InputCommon/GCAdapter.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp
index b5dc395b49..f0e938d5ff 100644
--- 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);