Android: Reload Wii Remote settings on emulation start

dolphin-emu · Apr 10, 2020 · af8ee4b · af8ee4b
1 parent 960ba4f
commit af8ee4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
@@ -80,6 +80,8 @@ public void onCreate(Bundle savedInstanceState)
     // So this fragment doesn't restart on configuration changes; i.e. rotation.
     setRetainInstance(true);
 
+    NativeLibrary.ReloadWiimoteConfig();
+
     mPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
 
     String[] gamePaths = getArguments().getStringArray(KEY_GAMEPATHS);

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