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

Fixed bug 3933 - Android, no need of the listener thread 

Sylvain

A listener thread has been added to know when the native thread would end.
But now, it is more easy to only check that after the main function has returned. It's one thread less.
This commit is contained in:
Sam Lantinga 2017-11-02 08:46:14 -07:00
parent 1475e6984a
commit 522901b88d
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,27 +371,8 @@ public class SDLActivity extends Activity {
// Start up the C app thread and enable sensor input for the first time
// FIXME: Why aren't we enabling sensor input at start?
final Thread sdlThread = new Thread(new SDLMain(), "SDLThread");
mSDLThread = new Thread(new SDLMain(), "SDLThread");
mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true);
sdlThread.start();
// Set up a listener thread to catch when the native thread ends
mSDLThread = new Thread(new Runnable() {
@Override
public void run() {
try {
sdlThread.join();
} catch (Exception e) {
// Ignore any exception
} finally {
// Native thread has finished
if (!mExitCalledFromJava) {
handleNativeExit();
}
}
}
}, "SDLThreadListener");
mSDLThread.start();
}
@ -1044,6 +1025,11 @@ class SDLMain implements Runnable {
SDLActivity.nativeRunMain(library, function, arguments);
Log.v("SDL", "Finished main function");
// Native thread has finished, let's finish the Activity
if (!SDLActivity.mExitCalledFromJava) {
SDLActivity.handleNativeExit();
}
}
}