Merge pull request #8093 from JosJuice/android-runtime-extension-change

Android: Support changing Wii Remote extension while emulating
dolphin-emu · May 12, 2019 · 1d5dd5d · 1d5dd5d
2 parents 0ab4171 + 8a4d15a
commit 1d5dd5d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -821,23 +821,18 @@ private void chooseController()
             (dialog, indexSelected) ->
             {
               editor.putInt("wiiController", indexSelected);
-
               NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension",
                       getResources().getStringArray(R.array.controllersValues)[indexSelected]);
+              NativeLibrary.ReloadWiimoteConfig();
             });
     builder.setPositiveButton(getString(R.string.ok), (dialogInterface, i) ->
     {
       editor.apply();
-
       mEmulationFragment.refreshInputOverlay();
-
-      Toast.makeText(getApplication(), R.string.emulation_controller_changed, Toast.LENGTH_SHORT)
-              .show();
     });
 
     AlertDialog alertDialog = builder.create();
     alertDialog.show();
-
   }
 
   private void setIRSensitivity()

diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
@@ -298,7 +298,6 @@
     <string name="emulation_control_joystick_rel_center">Relative Stick Center</string>
     <string name="emulation_control_rumble">Rumble</string>
     <string name="emulation_choose_controller">Choose Controller</string>
-    <string name="emulation_controller_changed">You may have to reload the game after changing extensions.</string>
     <string name="emulation_touch_button_help">Swipe down from the top of the screen to access the menu.</string>
     <string name="emulation_touch_overlay_reset">Reset Overlay</string>
     <string name="emulation_ir_group">Touch IR Pointer</string>