Commit 63317dfb1724e0ad0c63a5459e9441c0fa721a34

Sam Lantinga 2018-06-07T17:07:05

Don't crash on exit from SDLActivity if we don't have a singleton for some reason. (Thanks Rachel!)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
index b5e85bd..199a408 100644
--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -427,7 +427,10 @@ public class SDLActivity extends Activity {
     /* The native thread has finished */
     public static void handleNativeExit() {
         SDLActivity.mSDLThread = null;
-        mSingleton.finish();
+
+        // Make sure we currently have a singleton before we try to call it.
+        if (mSingleton != null)
+            mSingleton.finish();
     }