diff options
| author | JosJuice <josjuice@gmail.com> | 2022-07-19 23:00:21 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2022-07-19 23:00:21 +0200 |
| commit | 01e4ce54c889cdcb02e16642a7993c646cc6b069 (patch) | |
| tree | bf59dd2adf6ff4109334ce88eae8d110ab6f12d4 /Source/Android/jni/MainAndroid.cpp | |
| parent | b0b5faa79335895a8a0cca71567c5460c9584feb (diff) | |
Android: Call WiimoteReal::InitAdapterClass before controller init
Should fix https://bugs.dolphin-emu.org/issues/12980.
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index d41ebe4cc9..5a871ec041 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -519,6 +519,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Initialize(J Common::RegisterMsgAlertHandler(&MsgAlert); Common::AndroidSetReportHandler(&ReportSend); DolphinAnalytics::AndroidSetGetValFunc(&GetAnalyticValue); + + WiimoteReal::InitAdapterClass(); UICommon::Init(); UICommon::InitControllers(WindowSystemInfo(WindowSystemType::Android, nullptr, nullptr, nullptr)); } @@ -549,8 +551,6 @@ static void Run(JNIEnv* env, std::unique_ptr<BootParameters>&& boot, bool riivol { std::unique_lock<std::mutex> host_identity_guard(s_host_identity_lock); - WiimoteReal::InitAdapterClass(); - if (riivolution && std::holds_alternative<BootParameters::Disc>(boot->parameters)) { const std::string& riivolution_dir = File::GetUserPath(D_RIIVOLUTION_IDX); |
