encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: add mutex protection to onNativeOrientationChanged 

it's possible receive try to send an event between the check first for SDL_GetVideoDevice
and SDL_VideoQuit is called
This commit is contained in:
Sylvain Becker 2019-01-16 10:48:28 +01:00
parent e994be5833
commit 8a19ff3e2d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/android/SDL_android.c
View File

@ -700,11 +700,15 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeOrientationChanged)(
JNIEnv *env, jclass jcls, JNIEnv *env, jclass jcls,
jint orientation) jint orientation)
{ {
SDL_VideoDevice *_this = SDL_GetVideoDevice(); SDL_LockMutex(Android_ActivityMutex);
if (_this) {
if (Android_Window)
{
SDL_VideoDisplay *display = SDL_GetDisplay(0); SDL_VideoDisplay *display = SDL_GetDisplay(0);
SDL_SendDisplayEvent(display, SDL_DISPLAYEVENT_ORIENTATION, orientation); SDL_SendDisplayEvent(display, SDL_DISPLAYEVENT_ORIENTATION, orientation);
} }
SDL_UnlockMutex(Android_ActivityMutex);
} }
JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeAddTouch)( JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeAddTouch)(