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/Android/jni/MainAndroid.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/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index f150c2c9e9..77c373a481 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -521,6 +521,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Initialize(J Common::AndroidSetReportHandler(&ReportSend); DolphinAnalytics::AndroidSetGetValFunc(&GetAnalyticValue); UICommon::Init(); + GCAdapter::Init(); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ReportStartToAnalytics(JNIEnv*, |