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

Fixed bug 3728 - [Android] crash when shared libraries are no loaded 

Sylvain

On Android, when shared libraries are not correctly loaded (eg SDLActivity.mBrokenLibraries is true), there is a pop-up with an error message.

After user dismisses the pop-up, application crashes:
- because the native function "nativePause()" may no be loaded (if libSDL2.so is not loaded).
- because mSurface is null.
This commit is contained in:
Sam Lantinga 2017-08-09 20:23:48 -07:00
parent af44a5953a
commit a47bf37464
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,9 +265,6 @@ public class SDLActivity extends Activity {
protected void onDestroy() { protected void onDestroy() {
Log.v(TAG, "onDestroy()"); Log.v(TAG, "onDestroy()");
mNextNativeState = NativeState.PAUSED;
SDLActivity.handleNativeState();
if (SDLActivity.mBrokenLibraries) { if (SDLActivity.mBrokenLibraries) {
super.onDestroy(); super.onDestroy();
// Reset everything in case the user re opens the app // Reset everything in case the user re opens the app
@ -275,6 +272,9 @@ public class SDLActivity extends Activity {
return; return;
} }
mNextNativeState = NativeState.PAUSED;
SDLActivity.handleNativeState();
// Send a quit message to the application // Send a quit message to the application
SDLActivity.mExitCalledFromJava = true; SDLActivity.mExitCalledFromJava = true;
SDLActivity.nativeQuit(); SDLActivity.nativeQuit();