pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Android: prevent a dummy error message sending SDL_DISPLAYEVENT_ORIENTATION

Browse source 
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.
This commit is contained in:
Sylvain Becker 2019-01-09 23:19:26 +01:00
parent 3e5c960536
commit 78896bb303
2 changed files with 6 additions and 2 deletions
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.
mCurrentOrientation = SDLActivity.getCurrentOrientation();
// FIXME: with only one activity, SDL Thread is not yet started and this onNativeOrientationChanged() is ignored
SDLActivity.onNativeOrientationChanged(mCurrentOrientation);
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,
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 */