piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move libusb context initialization to on first use

Browse Source 
This prevents libusb warnings from showing up even when the user is
not using Bluetooth or USB passthrough, or the Wii U GC adapter.
This commit is contained in:
Léo Lam
2017-02-06 23:04:14 +01:00
parent db7ee668ff
commit 6a0bf24e0b
4 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,17 +170,8 @@ void Init()
s_libusb_driver_not_supported = false;
s_libusb_context = LibusbContext::Get();
if (!s_libusb_context)
{
s_libusb_driver_not_supported = true;
Shutdown();
}
else
{
if (UseAdapter())
StartScanThread();
}
if (UseAdapter())
StartScanThread();
}
void StartScanThread()
@ -188,6 +179,9 @@ void StartScanThread()
if (s_adapter_detect_thread_running.IsSet())
return;
s_libusb_context = LibusbContext::Get();
if (!s_libusb_context)
return;
s_adapter_detect_thread_running.Set(true);
s_adapter_detect_thread = std::thread(ScanThreadFunc);
}
@ -334,7 +328,7 @@ void Shutdown()
{
StopScanThread();
#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102
if (s_libusb_hotplug_enabled)
if (s_libusb_context && s_libusb_hotplug_enabled)
libusb_hotplug_deregister_callback(s_libusb_context.get(), s_hotplug_handle);
#endif
Reset();