Merge branch 'fixups' of github.com:riccardobl/jmonkeyengine into fixups

Author: riccardobl

jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java

@@ -456,7 +456,7 @@ private void configureOpenGLDriverHints(AppSettings settings) {
         final boolean angleGles = AppSettings.ANGLE_GLES3.equals(settings.getRenderer());
         if (!angleGles) {
             resetAngleLibraries();
-            if (org.lwjgl.system.Platform.get() == org.lwjgl.system.Platform.LINUX) {
+            if (org.lwjgl.system.Platform.get() == org.lwjgl.system.Platform.LINUX && !settings.isX11PlatformPreferred()) {
                 SDL_SetHint(SDL_HINT_VIDEO_FORCE_EGL, "1");
             } else {
                 SDL_ResetHint(SDL_HINT_VIDEO_FORCE_EGL);