Revert "(Android/Phoenix)expand on ROM load error message"

This reverts commit 232706d66563e6d1edaca1db70570a4e04f0d2cb.
This commit is contained in:
twinaphex 2013-02-27 04:28:05 +01:00
parent 7fadee0da3
commit a34c93e58f

View File

@ -474,18 +474,21 @@ public class RetroArch extends Activity implements
} }
break; break;
case ACTIVITY_NATIVE_ACTIVITY: case ACTIVITY_NATIVE_ACTIVITY:
Log.i(TAG, "native return");
AlertDialog.Builder builder = new AlertDialog.Builder(this).setNeutralButton("OK", null); AlertDialog.Builder builder = new AlertDialog.Builder(this).setNeutralButton("OK", null);
try { try {
DataInputStream cacheStream = new DataInputStream(new FileInputStream(return_file)); DataInputStream cacheStream = new DataInputStream(new FileInputStream(return_file));
int value = cacheStream.readInt(); int value = cacheStream.readInt();
cacheStream.close(); cacheStream.close();
Log.i(TAG, "native return value");
Log.i(TAG, "native return value:" + value);
if (value != 0) { if (value != 0) {
throw new IOException(); builder.setTitle("Error").setMessage("RetroArch Could not load the chosen ROM").show();
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
builder.setTitle("Crash").setMessage("RetroArch Crashed").show(); builder.setTitle("Crash").setMessage("RetroArch Crashed").show();
} catch (IOException e) { } 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(); new File(return_file).delete();
break; break;