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/DolphinQt/MainWindow.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Source/Core/DolphinQt/MainWindow.cpp') diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 9c7d4d37ae..3be8f9d6a0 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -113,6 +113,7 @@ #include "DolphinQt/WiiUpdate.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" +#include "InputCommon/GCAdapter.h" #include "UICommon/DiscordPresence.h" #include "UICommon/GameFile.h" @@ -328,6 +329,7 @@ void MainWindow::InitControllers() "No default device has been added in time. EmulatedController(s) defaulting adds" " input mappings made for a specific default device depending on the platform"); } + GCAdapter::Init(); Pad::Initialize(); Pad::InitializeGBA(); Keyboard::Initialize(); -- cgit v1.2.3