From a653822538986dbb369f81f506fe7b8a2d3f79eb Mon Sep 17 00:00:00 2001 From: sezero Date: Thu, 29 Dec 2011 21:44:36 +0000 Subject: [PATCH] gl_vidsdl.c (VID_Toggle): if SDL_WM_ToggleFullScreen() succeeded, ignore the vid_fullscreen callback function setting vid_changed to true. git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@577 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/gl_vidsdl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Quake/gl_vidsdl.c b/Quake/gl_vidsdl.c index 4bd74411..5ae253cd 100644 --- a/Quake/gl_vidsdl.c +++ b/Quake/gl_vidsdl.c @@ -1367,6 +1367,8 @@ void VID_Toggle (void) goto vrestart; if (SDL_WM_ToggleFullScreen(draw_context) == 1) { + qboolean was_changed = vid_changed; + Sbar_Changed (); // Sbar seems to need refreshing windowed = !windowed; if (vid.type == MODE_FULLSCREEN_DEFAULT) @@ -1374,7 +1376,11 @@ void VID_Toggle (void) else vid.type = MODE_FULLSCREEN_DEFAULT; + // since we succeeded, ignore the vid_fullscreen + // callback function setting vid_changed to true. + was_changed = vid_changed; Cvar_SetQuick (&vid_fullscreen, vid_fullscreen.value ? "0" : "1"); + vid_changed = was_changed; } else {