From 37806472e16b931cbcc9fe3fac630333cd403863 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Tue, 8 Mar 2022 13:16:54 -0800 Subject: GCAdapter: Defer initialization until MainWindow::InitControllers If libusb fails to initialize, an assertion fails, but if that happens before the main window is created, then Dolphin just dies. Now, the panic alert is properly shown and the user can ignore it. --- Source/Core/InputCommon/GCAdapter.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'Source/Core/InputCommon/GCAdapter.cpp') diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp index e03cf99f82..973d1a1d5f 100644 --- a/Source/Core/InputCommon/GCAdapter.cpp +++ b/Source/Core/InputCommon/GCAdapter.cpp @@ -75,7 +75,7 @@ static bool s_libusb_hotplug_enabled = false; static libusb_hotplug_callback_handle s_hotplug_handle; #endif -static LibusbUtils::Context s_libusb_context; +static std::unique_ptr s_libusb_context; static u8 s_endpoint_in = 0; static u8 s_endpoint_out = 0; @@ -172,7 +172,7 @@ static void ScanThreadFunc() if (s_libusb_hotplug_enabled) { if (libusb_hotplug_register_callback( - s_libusb_context, + *s_libusb_context, (libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT), LIBUSB_HOTPLUG_ENUMERATE, 0x057e, 0x0337, LIBUSB_HOTPLUG_MATCH_ANY, HotplugCallback, @@ -218,6 +218,8 @@ void Init() if (s_handle != nullptr) return; + s_libusb_context = std::make_unique(); + if (Core::GetState() != Core::State::Uninitialized && Core::GetState() != Core::State::Starting) { if ((CoreTiming::GetTicks() - s_last_init) < SystemTimers::GetTicksPerSecond()) @@ -240,7 +242,7 @@ void StartScanThread() { if (s_adapter_detect_thread_running.IsSet()) return; - if (!s_libusb_context.IsValid()) + if (!s_libusb_context->IsValid()) return; s_adapter_detect_thread_running.Set(true); s_adapter_detect_thread = std::thread(ScanThreadFunc); @@ -266,7 +268,7 @@ static void Setup() s_controller_type.fill(ControllerTypes::CONTROLLER_NONE); s_controller_rumble.fill(0); - s_libusb_context.GetDeviceList([](libusb_device* device) { + s_libusb_context->GetDeviceList([](libusb_device* device) { if (CheckDeviceAccess(device)) { // Only connect to a single adapter in case the user has multiple connected @@ -397,9 +399,10 @@ void Shutdown() { StopScanThread(); #if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 - if (s_libusb_context.IsValid() && s_libusb_hotplug_enabled) - libusb_hotplug_deregister_callback(s_libusb_context, s_hotplug_handle); + if (s_libusb_context->IsValid() && s_libusb_hotplug_enabled) + libusb_hotplug_deregister_callback(*s_libusb_context, s_hotplug_handle); #endif + s_libusb_context.reset(); Reset(); s_status = NO_ADAPTER_DETECTED; -- cgit v1.2.3