Skip to content
Permalink
Browse files

Android: allow multiple calls to nativeResume()

Doesn't seem to happen manually, but symetrical to the pause handling.

Can be tested by adding:

mNextNativeState = SDLActivity.NativeState.PAUSED;
handleNativeState();
mNextNativeState = SDLActivity.NativeState.RESUMED;
handleNativeState();
mNextNativeState = SDLActivity.NativeState.PAUSED;
handleNativeState();
mNextNativeState = SDLActivity.NativeState.RESUMED;
handleNativeState();

Before, it ends in 'paused' state.
Now, it ends in 'resumed' state.
  • Loading branch information
1bsyl committed Jan 6, 2019
1 parent 911f1d3 commit 9f23d1815f30e72e395bd0a11c751b55ded94320
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/core/android/SDL_android.c
@@ -802,7 +802,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeQuit)(
SDL_SendAppEvent(SDL_APP_TERMINATING);
/* Resume the event loop so that the app can catch SDL_QUIT which
* should now be the top event in the event queue. */
if (!SDL_SemValue(Android_ResumeSem)) SDL_SemPost(Android_ResumeSem);
SDL_SemPost(Android_ResumeSem);
}

/* Pause */
@@ -853,7 +853,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeResume)(
* We can't restore the GL Context here because it needs to be done on the SDL main thread
* and this function will be called from the Java thread instead.
*/
if (!SDL_SemValue(Android_ResumeSem)) SDL_SemPost(Android_ResumeSem);
SDL_SemPost(Android_ResumeSem);
}

SDL_UnlockMutex(Android_ActivityMutex);

0 comments on commit 9f23d18

Please sign in to comment.