diff options
| author | Léo Lam <leo@leolam.fr> | 2022-03-15 16:00:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-15 16:00:28 +0100 |
| commit | e10967e918594b3f22dfb3da1d092fd3f58b8af6 (patch) | |
| tree | 9e6d7b55d4bb866cce135cace0d4d89d06e8ffdf /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | da6f86f381e1a78ed7bb0ab19af34d6ce5251257 (diff) | |
| parent | 37806472e16b931cbcc9fe3fac630333cd403863 (diff) | |
Merge pull request #10502 from Pokechu22/defer-gcadapter
GCAdapter: Defer initialization until MainWindow::InitControllers
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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(); |
