From 10483e08e18cc203a803a5b474d789bdd41e07a3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 10 Dec 2012 19:13:39 +0100 Subject: [PATCH] (Phoenix) Can now go back to 'Select libretro core' from 'select ROM' menu by pressing Back button by returning RESULT_CANCELED from DirectoryActivity --- .../retroarch/browser/DirectoryActivity.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java b/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java index 52f6db7da8..f727c8881f 100644 --- a/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java +++ b/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java @@ -179,11 +179,20 @@ public class DirectoryActivity extends Activity implements AdapterView.OnItemCli @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - if(keyCode == KeyEvent.KEYCODE_BACK && backStack.size() > 1) + if(keyCode == KeyEvent.KEYCODE_BACK) { - backStack.remove(backStack.size() - 1); - wrapFiles(); - return true; + if(backStack.size() > 1) + { + backStack.remove(backStack.size() - 1); + wrapFiles(); + } + else + { + Intent intent=new Intent(); + setResult(RESULT_CANCELED, intent); + finish(); + } + return true; } return super.onKeyDown(keyCode, event);