geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: prevent a dummy error message sending SDL_DISPLAYEVENT_ORIENTATION 

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.
Sylvain Becker 2019-01-09 23:19:26 +01:00
parent 02f292eb13
commit 8dd915507e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
View File

@ -260,6 +260,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
// Get our current screen orientation and pass it down. // Get our current screen orientation and pass it down.
mCurrentOrientation = SDLActivity.getCurrentOrientation(); mCurrentOrientation = SDLActivity.getCurrentOrientation();
// FIXME: with only one activity, SDL Thread is not yet started and this onNativeOrientationChanged() is ignored
SDLActivity.onNativeOrientationChanged(mCurrentOrientation); SDLActivity.onNativeOrientationChanged(mCurrentOrientation);
setContentView(mLayout); setContentView(mLayout);

7
src/core/android/SDL_android.c
View File

@ -583,8 +583,11 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeOrientationChanged)(
JNIEnv *env, jclass jcls, JNIEnv *env, jclass jcls,
jint orientation) jint orientation)
{ {
SDL_VideoDisplay *display = SDL_GetDisplay(0); SDL_VideoDevice *_this = SDL_GetVideoDevice();
SDL_SendDisplayEvent(display, SDL_DISPLAYEVENT_ORIENTATION, orientation); if (_this) {
SDL_VideoDisplay *display = SDL_GetDisplay(0);
SDL_SendDisplayEvent(display, SDL_DISPLAYEVENT_ORIENTATION, orientation);
}
} }
/* Paddown */ /* Paddown */