From 723f5cea430d84da5a88e148c431f9e04e4e60c6 Mon Sep 17 00:00:00 2001
From: Sylvain <[EMAIL REDACTED]>
Date: Tue, 12 Oct 2021 20:58:58 +0200
Subject: [PATCH] Fixed bug #4825 - NullPointerException on
SDLActivity.getCurrentOrientation() (Thanks Benau!)
---
.../app/src/main/java/org/libsdl/app/SDLActivity.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
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 2d83b9f653..d71363f86e 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
@@ -379,11 +379,13 @@ protected void onStart() {
}
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;