diff options
| author | Pokechu22 <Pokechu022@gmail.com> | 2022-03-08 13:16:54 -0800 |
|---|---|---|
| committer | Pokechu22 <Pokechu022@gmail.com> | 2022-03-10 10:35:45 -0800 |
| commit | 37806472e16b931cbcc9fe3fac630333cd403863 (patch) | |
| tree | 44c0af1a4b3fc46179cb443b20dc2e3173c29d1e /Source/Core/DolphinNoGUI/MainNoGUI.cpp | |
| parent | 58c02e6b8585e0764643853f8e255b5013978469 (diff) | |
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.
Diffstat (limited to 'Source/Core/DolphinNoGUI/MainNoGUI.cpp')
| -rw-r--r-- | Source/Core/DolphinNoGUI/MainNoGUI.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp index 185bc447d9..cec4788f1c 100644 --- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp +++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp @@ -30,6 +30,8 @@ #endif #include "UICommon/UICommon.h" +#include "InputCommon/GCAdapter.h" + #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoBackendBase.h" @@ -226,6 +228,7 @@ int main(int argc, char* argv[]) UICommon::SetUserDirectory(user_directory); UICommon::Init(); + GCAdapter::Init(); s_platform = GetPlatform(options); if (!s_platform || !s_platform->Init()) |
