From edf5a98e80f360ba17394dad5f5efa4974a4cb89 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 19 Nov 2004 13:16:10 +0000 Subject: [PATCH] Mac OS X: Set fullscreen window to null before disposing --- src/java/org/lwjgl/opengl/MacOSXFrame.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/java/org/lwjgl/opengl/MacOSXFrame.java b/src/java/org/lwjgl/opengl/MacOSXFrame.java index c638eab6..f27fec6e 100644 --- a/src/java/org/lwjgl/opengl/MacOSXFrame.java +++ b/src/java/org/lwjgl/opengl/MacOSXFrame.java @@ -80,10 +80,13 @@ final class MacOSXFrame extends Frame implements WindowListener, ComponentListen if (fullscreen) { getDevice().setFullScreenWindow(this); getDevice().setDisplayMode(requested_mode); + java.awt.DisplayMode real_mode = getDevice().getDisplayMode(); /** For some strange reason, the display mode is sometimes silently capped even though the mode is reported as supported */ - if (requested_mode.getWidth() != getDevice().getDisplayMode().getWidth() || requested_mode.getHeight() != getDevice().getDisplayMode().getHeight()) { + if (requested_mode.getWidth() != real_mode.getWidth() || requested_mode.getHeight() != real_mode.getHeight()) { + getDevice().setFullScreenWindow(null); syncDispose(); - throw new LWJGLException("AWT capped mode"); + throw new LWJGLException("AWT capped mode: requested mode = " + requested_mode.getWidth() + "x" + requested_mode.getHeight() + + " but got " + real_mode.getWidth() + " " + real_mode.getHeight()); } } pack();