Merge pull request #10502 from Pokechu22/defer-gcadapter

GCAdapter: Defer initialization until MainWindow::InitControllers
This commit is contained in:
Léo Lam
2022-03-15 16:00:28 +01:00
committed by GitHub
5 changed files with 15 additions and 7 deletions

View File

@ -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();