From 325ae5c35d28ffc059dd91d7a94bcf62494debb3 Mon Sep 17 00:00:00 2001
From: Sylvain <[EMAIL REDACTED]>
Date: Wed, 13 Oct 2021 08:35:56 +0200
Subject: [PATCH] Android: getCurrentOrientation uses getContext() to retrieve
the activity (see bug #4825)
---
.../app/src/main/java/org/libsdl/app/SDLActivity.java | 5 +++--
1 file changed, 3 insertions(+), 2 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 d71363f86e..f850b0a603 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
@@ -381,10 +381,11 @@ protected void onStart() {
public static int getCurrentOrientation() {
int result = SDL_ORIENTATION_UNKNOWN;
- if (mSingleton == null) {
+ Activity activity = (Activity)getContext();
+ if (activity == null) {
return result;
}
- Display display = SDLActivity.mSingleton.getWindowManager().getDefaultDisplay();
+ Display display = activity.getWindowManager().getDefaultDisplay();
switch (display.getRotation()) {
case Surface.ROTATION_0: