From 59cf65ed217d573eb8f9fb3ea88331386cc4e4ce Mon Sep 17 00:00:00 2001 From: fayjf Date: Thu, 17 Mar 2011 02:55:51 +0000 Subject: [PATCH] Implementing the 'gamemode-testing_windows.patch' per e-mail from Diederick Niehorster dated 3/16/11 1:06 AM git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@902 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/freeglut_gamemode.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/freeglut/freeglut/src/freeglut_gamemode.c b/freeglut/freeglut/src/freeglut_gamemode.c index 7569d1f..2425ac4 100644 --- a/freeglut/freeglut/src/freeglut_gamemode.c +++ b/freeglut/freeglut/src/freeglut_gamemode.c @@ -477,12 +477,15 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest ) case DISP_CHANGE_SUCCESSFUL: success = GL_TRUE; - /* update vars in case if windows switched to proper mode */ - EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode ); - fgState.GameModeSize.X = devMode.dmPelsWidth; - fgState.GameModeSize.Y = devMode.dmPelsHeight; - fgState.GameModeDepth = devMode.dmBitsPerPel; - fgState.GameModeRefresh = devMode.dmDisplayFrequency; + if (!haveToTest) + { + /* update vars in case if windows switched to proper mode */ + EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode ); + fgState.GameModeSize.X = devMode.dmPelsWidth; + fgState.GameModeSize.Y = devMode.dmPelsHeight; + fgState.GameModeDepth = devMode.dmBitsPerPel; + fgState.GameModeRefresh = devMode.dmDisplayFrequency; + } break; case DISP_CHANGE_RESTART: fggmstr = "The computer must be restarted for the graphics mode to work.";