diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-01-20 22:41:19 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2016-01-20 22:41:19 +0100 |
| commit | 3a12dccac7f743b92ef1ca0fb9130453bb4ef031 (patch) | |
| tree | 1b74dcdcfb67f516d232614563ace2f3bc30fcf9 /Source/Core/InputCommon/GCAdapter.cpp | |
| parent | a14c07413f3c74a788238c5cd75cd5c6b0de32ac (diff) | |
| parent | 70aa012fefc080d3eff39673cb29725dfd4e0e74 (diff) | |
Merge pull request #3539 from Sonicadvance1/two_adapters_one_pc
Allow multiple GC adapters on one PC to be used with multiple Dolphin instances.
Diffstat (limited to 'Source/Core/InputCommon/GCAdapter.cpp')
| -rw-r--r-- | Source/Core/InputCommon/GCAdapter.cpp | 4 |
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); |