Browse Source

Fixed bug #4825 - NullPointerException on SDLActivity.getCurrentOrientation() (Thanks Benau!)

Sylvain 3 years ago
parent
commit
723f5cea43
1 changed files with 5 additions and 3 deletions
  1. 5 3
      android-project/app/src/main/java/org/libsdl/app/SDLActivity.java

+ 5 - 3
android-project/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -379,11 +379,13 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     }
 
     public static int getCurrentOrientation() {
-        final Context context = SDLActivity.getContext();
-        final Display display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-
         int result = SDL_ORIENTATION_UNKNOWN;
 
+        if (mSingleton == null) {
+            return result;
+        }
+        Display display = SDLActivity.mSingleton.getWindowManager().getDefaultDisplay();
+
         switch (display.getRotation()) {
             case Surface.ROTATION_0:
                 result = SDL_ORIENTATION_PORTRAIT;