Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-08-06 07:25:14 +00:00
Code Issues Projects Releases Wiki Activity

Prevent creating a second native CPU thread on multiple onCreate() calls

Browse Source 
- This was blowing up in an assert on the native side, yay defensive coding!
This commit is contained in:
Aaron Culliney
2015-04-14 21:48:55 -07:00
parent 2bc846d1fe
commit ee8660e394
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Android/jni/jnihooks.c
View File

@@ -76,6 +76,13 @@ static inline int _androidTouchEvent2JoystickEvent(jint action) {
void Java_org_deadc0de_apple2ix_Apple2Activity_nativeOnCreate(JNIEnv *env, jobject obj, jstring j_dataDir) {
const char *dataDir = (*env)->GetStringUTFChars(env, j_dataDir, 0);
// Android lifecycle can call onCreate() multiple times...
if (data_dir) {
LOG("IGNORING multiple calls to nativeOnCreate ...");
return;
}
data_dir = strdup(dataDir);
(*env)->ReleaseStringUTFChars(env, j_dataDir, dataDir);
LOG("nativeOnCreate(%s)...", data_dir);
@@ -158,7 +165,7 @@ void Java_org_deadc0de_apple2ix_Apple2Activity_nativeReboot(JNIEnv *env, jobject
}
void Java_org_deadc0de_apple2ix_Apple2Activity_nativeOnQuit(JNIEnv *env, jobject obj) {
LOG("%s", "native quit...");
LOG("%s", "nativeOnQuit...");
c_eject_6(0);
c_eject_6(1);