ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Verify freezing is not a context / thread issue" 

This reverts commit 21fbad3ba5.
This commit is contained in:
TwistedUmbrella 2015-04-01 10:19:46 -04:00
parent 5579204c10
commit 80af0d364e
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shell/android/res/values/strings.xml
View File

@ -22,8 +22,7 @@
<string name="missing_flash">The Dreamcast Flash is missing. A dump of the Dreamcast Flash is required for this emulator to work. Make sure the Flash file is named "dc_flash.bin" and is in %1$s/data/dc_flash.bin</string>
<string name="require_bios">You have to provide a Dreamcast BIOS.</string>
<string name="data_folder">The current data folder is assumed.</string>
<string name="emu_crash">Emulator Error!</string>
<string name="emu_toast">Emulator Error:\n %1$s</string>
<string name="emu_crash">Emulator Error:\n %1$s</string>
<string name="folder_bios">Boot BIOS</string>
<string name="folder_select">Select current folder</string>

21
shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
View File

@ -10,9 +10,7 @@ import javax.microedition.khronos.opengles.GL10;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.graphics.Paint;
@ -694,22 +692,9 @@ public class GL2JNIView extends GLSurfaceView
handler.post(new Runnable() {
public void run() {
Log.d(context.getApplicationContext().getPackageName(), msg);
// MainActivity.showToastMessage(context,
// context.getString(R.string.emu_toast, msg),
// Toast.LENGTH_LONG);
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
alertDialogBuilder.setTitle(context.getString(R.string.emu_crash));
alertDialogBuilder
.setMessage(msg)
.setCancelable(false)
.setPositiveButton("Okay...",new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,int id) {
// if this button is clicked, close current activity
// MainActivity.this.finish();
}
});
AlertDialog alertDialog = alertDialogBuilder.create();
alertDialog.show();
MainActivity.showToastMessage(context,
context.getString(R.string.emu_crash, msg),
Toast.LENGTH_LONG);
}
});
}