summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorSean Maas <seanmaas27@gmail.com>2016-09-16 17:43:38 -0400
committerGitHub <noreply@github.com>2016-09-16 17:43:38 -0400
commit094470ead64f100d5bce066005d2e561314f0985 (patch)
tree16968e4dbfd5ae23cdb2699b3441b9fe1c4e9407 /Source/Android/app/src/main/java
parent22b5d89bf15e22de63264771c1f373519ea5cc25 (diff)
Android: fix save and load state menus on non-TV devices
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java10
1 files changed, 8 insertions, 2 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 391bd99852..822b41b11d 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
@@ -426,11 +426,17 @@ public final class EmulationActivity extends AppCompatActivity
// TV Menu only
case R.id.menu_emulation_save_root:
- showMenu(SaveStateFragment.FRAGMENT_ID);
+ if (!mDeviceHasTouchScreen)
+ {
+ showMenu(SaveStateFragment.FRAGMENT_ID);
+ }
return;
case R.id.menu_emulation_load_root:
- showMenu(LoadStateFragment.FRAGMENT_ID);
+ if (!mDeviceHasTouchScreen)
+ {
+ showMenu(LoadStateFragment.FRAGMENT_ID);
+ }
return;
// Save state slots