eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Android: some robustness when quitting application from onDestroy()

Browse source 
Make sure there is not pending Pause accumulated, so the the application doesn't
remain paused and stucked in onDestroy().

Can be tested by adding:
 SDLActivity.nativePause();
 SDLActivity.nativePause();
 mSingleton.finish();
This commit is contained in:
Sylvain Becker 2019-01-07 11:35:31 +01:00
parent 462e62e154
commit cfe2924d07
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/android/SDL_android.c
View file

@ -800,6 +800,10 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeQuit)(
/* Inject a SDL_QUIT event */ /* Inject a SDL_QUIT event */
SDL_SendQuit(); SDL_SendQuit();
SDL_SendAppEvent(SDL_APP_TERMINATING); SDL_SendAppEvent(SDL_APP_TERMINATING);
/* Robustness: clear any pending Pause */
while (SDL_SemTryWait(Android_PauseSem) == 0) {
/* empty */
}
/* Resume the event loop so that the app can catch SDL_QUIT which /* Resume the event loop so that the app can catch SDL_QUIT which
* should now be the top event in the event queue. */ * should now be the top event in the event queue. */
SDL_SemPost(Android_ResumeSem); SDL_SemPost(Android_ResumeSem);