summaryrefslogtreecommitdiff
path: root/Source/Android/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Android/app/src')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java9
-rw-r--r--Source/Android/app/src/main/res/values/strings.xml1
2 files changed, 10 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
index 10ca9ddef2..2cf2883fda 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
@@ -312,6 +312,15 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
public void onInputMappingClick(final InputMappingControlSetting item, final int position)
{
+ if (item.getController().getDefaultDevice().isEmpty() && !mView.isMappingAllDevices())
+ {
+ new MaterialAlertDialogBuilder(mView.getActivity())
+ .setMessage(R.string.input_binding_no_device)
+ .setPositiveButton(R.string.ok, this)
+ .show();
+ return;
+ }
+
final MotionAlertDialog dialog = new MotionAlertDialog(mView.getActivity(), item,
mView.isMappingAllDevices());
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index f8c4852027..ff41d8a631 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -33,6 +33,7 @@
<string name="input_binding">Input Binding</string>
<string name="input_binding_description">Press or move an input to bind it to %1$s.</string>
+ <string name="input_binding_no_device">You need to select a device first!</string>
<!-- Main Preference Fragment -->
<string name="settings">Settings</string>