From 094470ead64f100d5bce066005d2e561314f0985 Mon Sep 17 00:00:00 2001 From: Sean Maas Date: Fri, 16 Sep 2016 17:43:38 -0400 Subject: [PATCH] Android: fix save and load state menus on non-TV devices --- .../dolphinemu/activities/EmulationActivity.java | 10 ++++++++-- 1 file 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