ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCAdapter: Close libusb handle if an open error occurs 

The handle was previously kept open, which was causing future adapter
plug/unplug events to be ignored.
This commit is contained in:
Vincent Duvert 2018-07-17 22:29:48 +02:00
parent 80d8173d29
commit 0165e5e703
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/InputCommon/GCAdapter.cpp
View File

@ -276,12 +276,18 @@ static bool CheckDeviceAccess(libusb_device* device)
// this split is needed so that we don't avoid claiming the interface when // this split is needed so that we don't avoid claiming the interface when
// detaching the kernel driver is successful // detaching the kernel driver is successful
if (ret != 0 && ret != LIBUSB_ERROR_NOT_SUPPORTED) if (ret != 0 && ret != LIBUSB_ERROR_NOT_SUPPORTED)
{
libusb_close(s_handle);
s_handle = nullptr;
return false; return false;
}
ret = libusb_claim_interface(s_handle, 0); ret = libusb_claim_interface(s_handle, 0);
if (ret) if (ret)
{ {
ERROR_LOG(SERIALINTERFACE, "libusb_claim_interface failed with error: %d", ret); ERROR_LOG(SERIALINTERFACE, "libusb_claim_interface failed with error: %d", ret);
libusb_close(s_handle);
s_handle = nullptr;
return false; return false;
} }