mirrors
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: add timeout when waiting the SDL thread to finish 

C SDLmain() thread might have started (mSDLThread.start() called)
while the SDL_Init() might not have been called yet,
and so the previous QUIT event will be discarded by SDL_Init() and app is running, not exiting.

This is reprocible by adding instrumentation code in the SDLActivity.

And hopefully, this could fix an ANR, where SDLActivity is in WAITING state (in thread.join()):
  at java.lang.Thread.join (Thread.java:1519)
  at org.libsdl.app.SDLActivity.onDestroy (SDLActivity.java)

while SDLThread seems to be running
This commit is contained in:
Sylvain 2023-06-12 11:45:46 +02:00 committed by Sylvain Becker
parent 125e7420ec
commit 4e0f94ea7d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
View File

@ -658,7 +658,11 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
// Wait for "SDLThread" thread to end
try {
SDLActivity.mSDLThread.join();
// 500ms timeout, because:
// C SDLmain() thread might have started (mSDLThread.start() called)
// while the SDL_Init() might not have been called yet,
// and so the previous QUIT event will be discarded by SDL_Init() and app is running, not exiting.
SDLActivity.mSDLThread.join(500);
} catch(Exception e) {
Log.v(TAG, "Problem stopping SDLThread: " + e);
}