summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorConnor McLaughlin <stenzek@gmail.com>2019-05-12 15:22:07 +1000
committerGitHub <noreply@github.com>2019-05-12 15:22:07 +1000
commit1d5dd5db914d94f3f612c13c6c5e1d5e711b49b5 (patch)
treed4a28ebf8d4221850c45e03f831657e078a1770d /Source/Android/app/src/main/java
parent0ab41717a41531962c4c473625766e4c7018f478 (diff)
parent8a4d15ae472e4fd8068994d9e02fb0d65d2edbee (diff)
Merge pull request #8093 from JosJuice/android-runtime-extension-change
Android: Support changing Wii Remote extension while emulating
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java7
1 files changed, 1 insertions, 6 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
index 3ba7e5f893..9356b7d4d4 100644
--- 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 @@ public final class EmulationActivity extends AppCompatActivity
(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()