From a34c93e58f38c362c526ed9bf1610c944873894f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 27 Feb 2013 04:28:05 +0100 Subject: [PATCH] Revert "(Android/Phoenix)expand on ROM load error message" This reverts commit 232706d66563e6d1edaca1db70570a4e04f0d2cb. --- android/phoenix/src/org/retroarch/browser/RetroArch.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java index 24b5d0ba77..03bc47adc6 100644 --- a/android/phoenix/src/org/retroarch/browser/RetroArch.java +++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java @@ -474,18 +474,21 @@ public class RetroArch extends Activity implements } break; case ACTIVITY_NATIVE_ACTIVITY: + Log.i(TAG, "native return"); AlertDialog.Builder builder = new AlertDialog.Builder(this).setNeutralButton("OK", null); try { DataInputStream cacheStream = new DataInputStream(new FileInputStream(return_file)); int value = cacheStream.readInt(); cacheStream.close(); + Log.i(TAG, "native return value"); + Log.i(TAG, "native return value:" + value); if (value != 0) { - throw new IOException(); + builder.setTitle("Error").setMessage("RetroArch Could not load the chosen ROM").show(); } } catch (FileNotFoundException e) { builder.setTitle("Crash").setMessage("RetroArch Crashed").show(); } catch (IOException e) { - builder.setTitle("Error").setMessage("RetroArch Could not load the chosen ROM.\n\nCheck the Cores Guide for details on valid ROMs for this emulator.").show(); + builder.setTitle("Error").setMessage("RetroArch Could not load the chosen ROM").show(); } new File(return_file).delete(); break;