Merge pull request #7530 from zackhow/settings-fix

Android: fix custom game control ui
dolphin-emu · Oct 29, 2018 · 580c26d · 580c26d
2 parents 2b905eb + e02b80c
commit 580c26d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java b/...main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java
@@ -75,7 +75,7 @@ public StringSetting setValue(String bind, String ui)
             preferences =
             PreferenceManager.getDefaultSharedPreferences(DolphinApplication.getAppContext());
     SharedPreferences.Editor editor = preferences.edit();
-    editor.putString(getKey(), ui);
+    editor.putString(getKey() + gameId, ui);
     editor.apply();
 
     if (getSetting() == null)

diff --git a/...va/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/RumbleBindingViewHolder.java b/...va/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/RumbleBindingViewHolder.java
@@ -42,7 +42,8 @@ public void bind(SettingsItem item)
     mItem = (RumbleBindingSetting) item;
 
     mTextSettingName.setText(item.getNameId());
-    mTextSettingDescription.setText(sharedPreferences.getString(mItem.getKey(), ""));
+    mTextSettingDescription
+            .setText(sharedPreferences.getString(mItem.getKey() + mItem.getGameId(), ""));
   }
 
   @Override