Commit 33642b47b28bbb326d347f49c8ce6cde42168eff

Sylvain Becker 2020-05-08T21:50:23

Android: robustness if locale failed to be detected at start

1
2
3
4
5
6
7
8
9
10
11
12
13
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 f051d96..df58b71 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
@@ -423,7 +423,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         Log.v(TAG, "onConfigurationChanged()");
         super.onConfigurationChanged(newConfig);
 
-        if (!mCurrentLocale.equals(newConfig.locale)) {
+        if (mCurrentLocale == null || !mCurrentLocale.equals(newConfig.locale)) {
             mCurrentLocale = newConfig.locale;
             SDLActivity.onNativeLocaleChanged();
         }