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

IOS/USB: Unref libusb devices manually

This commit is contained in:
Léo Lam 2017-03-26 15:15:50 +02:00
parent 32a1b5068a
commit 9aaaa2b924
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/IOS/USB/Host.cpp
View File

@ -145,17 +145,25 @@ bool USBHost::AddNewDevices(std::set<u64>& new_devices, DeviceChangeHooks& hooks
libusb_get_device_descriptor(device, &descriptor); libusb_get_device_descriptor(device, &descriptor);
if (!SConfig::GetInstance().IsUSBDeviceWhitelisted( if (!SConfig::GetInstance().IsUSBDeviceWhitelisted(
{descriptor.idVendor, descriptor.idProduct})) {descriptor.idVendor, descriptor.idProduct}))
{
libusb_unref_device(device);
continue; continue;
}
auto usb_device = std::make_unique<USB::LibusbDevice>(device, descriptor); auto usb_device = std::make_unique<USB::LibusbDevice>(device, descriptor);
if (!ShouldAddDevice(*usb_device)) if (!ShouldAddDevice(*usb_device))
{
libusb_unref_device(device);
continue; continue;
}
const u64 id = usb_device->GetId(); const u64 id = usb_device->GetId();
new_devices.insert(id); new_devices.insert(id);
if (AddDevice(std::move(usb_device)) || always_add_hooks) if (AddDevice(std::move(usb_device)) || always_add_hooks)
hooks.emplace(GetDeviceById(id), ChangeEvent::Inserted); hooks.emplace(GetDeviceById(id), ChangeEvent::Inserted);
else
libusb_unref_device(device);
} }
libusb_free_device_list(list, 1); libusb_free_device_list(list, 0);
} }
#endif #endif
return true; return true;