Merge pull request #8735 from Ebola16/INIT

Android: Reload Wii Remote settings upon saving them
dolphin-emu · Apr 17, 2020 · cf67b20 · cf67b20
2 parents 9de3717 + 0b66310
commit cf67b20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/...Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java b/...Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
@@ -181,6 +181,7 @@ public void saveSettings(SettingsActivityView view)
 
       // Notify the native code of the changes
       NativeLibrary.ReloadConfig();
+      NativeLibrary.ReloadWiimoteConfig();
     }
     else
     {

diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
@@ -597,6 +597,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_RefreshWiimo
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ReloadWiimoteConfig(JNIEnv* env,
                                                                                         jobject obj)
 {
+  WiimoteReal::LoadSettings();
   Wiimote::LoadConfig();
 }