mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-28 19:58:53 +00:00
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.
This commit is contained in:
parent
58c02e6b85
commit
37806472e1
5 changed files with 15 additions and 7 deletions
|
@ -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())
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue