shadowfacts/lwjgl2-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/lwjgl2-arm64.git synced 2025-12-06 08:01:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore setDisplayMode when the Display parent is set. Fix #98

Browse source
This commit is contained in:
Ioannis Tsakpinis 2015-05-20 15:20:12 +03:00
parent 1dbca8b623
commit a5c4462a3e
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/java/org/lwjgl/opengl/Display.java
View file

@ -239,21 +239,21 @@ public final class Display {
throw new NullPointerException("mode must be non-null"); throw new NullPointerException("mode must be non-null");
boolean was_fullscreen = isFullscreen(); boolean was_fullscreen = isFullscreen();
current_mode = mode; current_mode = mode;
if ( isCreated() ) { if ( !isCreated() || parent != null )
destroyWindow(); return;
// If mode is not fullscreen capable, make sure we are in windowed mode destroyWindow();
try { // If mode is not fullscreen capable, make sure we are in windowed mode
if ( was_fullscreen && !isFullscreen() ) try {
display_impl.resetDisplayMode(); if ( was_fullscreen && !isFullscreen() )
else if ( isFullscreen() )
switchDisplayMode();
createWindow();
makeCurrentAndSetSwapInterval();
} catch (LWJGLException e) {
drawable.destroy();
display_impl.resetDisplayMode(); display_impl.resetDisplayMode();
throw e; else if ( isFullscreen() )
} switchDisplayMode();
createWindow();
makeCurrentAndSetSwapInterval();
} catch (LWJGLException e) {
drawable.destroy();
display_impl.resetDisplayMode();
throw e;
} }
} }
} }