mirror of
https://github.com/Ryujinx/SDL.git
synced 2024-12-23 08:45:37 +00:00
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:
parent
1475e6984a
commit
522901b88d
|
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue