[Android] Fixes Bug 2041 - can't get SDL_QUIT event...

Thanks to Denis Bernard!

Also, changed the Android manifest so the app doesn't quit with orientation
changes, and made testgles.c exit properly on Android.
This commit is contained in:
Gabriel Jacobo committed 2013-11-06 11:23:24 -03:00
1 parent e27248c27e
commit 22770a8f40
5 files changed
+18 -5

No files matched your search

+3 -1
View File
@@ -22,7 +22,9 @@
android:allowBackup="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
<activity android:name="SDLActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
@@ -121,13 +121,13 @@ public class SDLActivity extends Activity {
SDLActivity.nativeQuit();
// Now wait for the SDL thread to quit
if (mSDLThread != null) {
if (SDLActivity.mSDLThread != null) {
try {
mSDLThread.join();
SDLActivity.mSDLThread.join();
} catch(Exception e) {
Log.v("SDL", "Problem stopping thread: " + e);
}
mSDLThread = null;
SDLActivity.mSDLThread = null;
//Log.v("SDL", "Finished waiting for SDL thread");
}