X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_window.c;h=ad151cfacd4359877a2c08c3bb979af4c2a32105;hb=7557578d8d1f6f0e091a7df25c8d1ab573ad8867;hp=efbae89671b8a4ea9d7f8e1158c855303f4d9d9d;hpb=19242860f0cd6d3f2c3e32e87e15fe5e1151d072;p=freeglut diff --git a/src/fg_window.c b/src/fg_window.c index efbae89..ad151cf 100644 --- a/src/fg_window.c +++ b/src/fg_window.c @@ -151,7 +151,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, fgInitGL2(); - window->State.NeedToFixMyNameInitContext = GL_TRUE; + window->State.NeedToInitContext = GL_TRUE; } /* @@ -326,8 +326,6 @@ void FGAPIENTRY glutIconifyWindow( void ) FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutIconifyWindow" ); FREEGLUT_EXIT_IF_NO_WINDOW ( "glutIconifyWindow" ); - fgStructure.CurrentWindow->State.Visible = GL_FALSE; - fgPlatformGlutIconifyWindow (); fgStructure.CurrentWindow->State.Redisplay = GL_FALSE; @@ -439,9 +437,11 @@ void FGAPIENTRY glutFullScreen( void ) fgWarning("glutFullScreen called on a child window, ignoring..."); return; } - else if (fgStructure.GameModeWindow != NULL && fgStructure.GameModeWindow->ID==win->ID) + else if (fgStructure.GameModeWindow != NULL && fgStructure.GameModeWindow->ID==win->ID && win->State.IsFullscreen) { - /* Ignore fullscreen call on GameMode window, those are always fullscreen already */ + /* Ignore fullscreen call on GameMode window, those are always fullscreen already + * only exception is during first entering GameMode + */ return; }