Android: prevent a dummy error message sending SDL_DISPLAYEVENT_ORIEN…

…TATION In the usual case, first call to onNativeOrientationChanged() is done before SDL has been initialised and would just set an error message "Video subsystem has not been initialized" without sending the event.
libsdl-org · Jan 9, 2019 · 8dd9155 · 8dd9155
1 parent 02f292e
commit 8dd9155
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -260,6 +260,7 @@ public void onClick(DialogInterface dialog,int id) {
 
         // Get our current screen orientation and pass it down.
         mCurrentOrientation = SDLActivity.getCurrentOrientation();
+        // FIXME: with only one activity, SDL Thread is not yet started and this onNativeOrientationChanged() is ignored
         SDLActivity.onNativeOrientationChanged(mCurrentOrientation);
 
         setContentView(mLayout);

diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
@@ -583,8 +583,11 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeOrientationChanged)(
                                     JNIEnv *env, jclass jcls,
                                     jint orientation)
 {
-    SDL_VideoDisplay *display = SDL_GetDisplay(0);
-    SDL_SendDisplayEvent(display, SDL_DISPLAYEVENT_ORIENTATION, orientation);
+    SDL_VideoDevice *_this = SDL_GetVideoDevice();
+    if (_this) {
+        SDL_VideoDisplay *display = SDL_GetDisplay(0);
+        SDL_SendDisplayEvent(display, SDL_DISPLAYEVENT_ORIENTATION, orientation);
+    }
 }
 
 /* Paddown */