Android: nativeQuit for SDLActivity thread
- destroy Android_ActivityMutex
- display any SDL error message that may have occured in this thread,
since SDL_GetError() is thread specific, and user has no access to it.
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
index 38c2cd8..5fe46e0 100644
--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -405,6 +405,8 @@
}
}
+ SDLActivity.nativeQuit();
+
super.onDestroy();
}
@@ -727,6 +729,7 @@
public static native int nativeRunMain(String library, String function, Object arguments);
public static native void nativeLowMemory();
public static native void nativeSendQuit();
+ public static native void nativeQuit();
public static native void nativePause();
public static native void nativeResume();
public static native void onNativeDropFile(String filename);
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
index 9811653..0a51f03 100644
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@@ -125,6 +125,9 @@
JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSendQuit)(
JNIEnv *env, jclass cls);
+JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeQuit)(
+ JNIEnv *env, jclass cls);
+
JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativePause)(
JNIEnv *env, jclass cls);
@@ -833,6 +836,25 @@
SDL_SemPost(Android_ResumeSem);
}
+/* Activity ends */
+JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeQuit)(
+ JNIEnv *env, jclass cls)
+{
+ const char *str;
+
+ if (Android_ActivityMutex) {
+ SDL_DestroyMutex(Android_ActivityMutex);
+ Android_ActivityMutex = NULL;
+ }
+
+ str = SDL_GetError();
+ if (str && str[0]) {
+ __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "SDLActivity thread ends (error=%s)", str);
+ } else {
+ __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "SDLActivity thread ends");
+ }
+}
+
/* Pause */
JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativePause)(
JNIEnv *env, jclass cls)