diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-09-19 22:32:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-19 22:32:05 +0200 |
| commit | 90ab9525881689881e7d9b85e49e1a34220dac3f (patch) | |
| tree | b3e1ce19099fb95f42218202f2c55bda0d1fb5d0 /Source/Android/app/src/main/java | |
| parent | 0e2ec349ad7305e16629a113bf767640a2f8d123 (diff) | |
| parent | 094470ead64f100d5bce066005d2e561314f0985 (diff) | |
Merge pull request #4219 from SeannyM/android-state
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.java | 10 |
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 |