Merge pull request #5339 from mahdihijazi/fix_edit_controls_layout

[Android] Fix edit controls layout
dolphin-emu · Apr 30, 2017 · 7216954 · 7216954
2 parents f0a89f8 + ff475a2
commit 7216954
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 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
@@ -468,7 +468,11 @@ public boolean onCreateOptionsMenu(Menu menu)
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item)
 	{
-		handleMenuAction(buttonsActionsMap.get(item.getItemId()));
+		int action = buttonsActionsMap.get(item.getItemId(), -1);
+		if (action >= 0)
+		{
+			handleMenuAction(action);
+		}
 		return true;
 	}
 

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/LoadStateFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/LoadStateFragment.java
@@ -62,6 +62,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 	@Override
 	public void onClick(View button)
 	{
-		((EmulationActivity) getActivity()).handleMenuAction(buttonsActionsMap.get(button.getId()));
+		int action = buttonsActionsMap.get(button.getId(), -1);
+		if (action >= 0)
+		{
+			((EmulationActivity) getActivity()).handleMenuAction(action);
+		}
 	}
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java
@@ -54,7 +54,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 	@Override
 	public void onClick(View button)
 	{
-		((EmulationActivity) getActivity()).handleMenuAction(buttonsActionsMap.get(button.getId()));
+		int action = buttonsActionsMap.get(button.getId());
+		if (action >= 0)
+		{
+			((EmulationActivity) getActivity()).handleMenuAction(action);
+		}
 	}
 
 	public void setTitleText(String title)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveStateFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveStateFragment.java
@@ -62,6 +62,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 	@Override
 	public void onClick(View button)
 	{
-		((EmulationActivity) getActivity()).handleMenuAction(buttonsActionsMap.get(button.getId()));
+		int action = buttonsActionsMap.get(button.getId(), -1);
+		if (action >= 0)
+		{
+			((EmulationActivity) getActivity()).handleMenuAction(action);
+		}
 	}
 }