X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_window.c;h=711defb641b8a488f4eaacb9dbb683b860b1f482;hb=33809048f02c69b63bc8ac4a0fafc7f6eaf4a363;hp=9760858a9debabd29c7741b8fb9884b328f8191b;hpb=5e0c2363eddcc91af3574ea5777e686e8998e390;p=freeglut diff --git a/src/fg_window.c b/src/fg_window.c index 9760858..711defb 100644 --- a/src/fg_window.c +++ b/src/fg_window.c @@ -148,6 +148,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, #endif window->Window.attribute_v_coord = -1; window->Window.attribute_v_normal = -1; + window->Window.attribute_v_texture = -1; fgInitGL2(); @@ -326,8 +327,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 +438,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; }