X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_callbacks.c;h=9eee649b6a1474f3874d61c9f264f21740d74a08;hb=9092fad9f750e8bab3ce7d7fc5a30f2b036a1cfb;hp=f34fe1b7e3afb5ba8fa50bd9acf8736712ce8e5e;hpb=224638013a9db16bbbe6e3ff05d6cac9a939c262;p=freeglut

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index f34fe1b..9eee649 100644
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -115,19 +115,14 @@ void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ),
  */
 static void fghVisibility( int status )
 {
-    FGCBVisibility vis;
-    int glut_status;
+    int glut_status = GLUT_VISIBLE;
     
     freeglut_assert_ready;
     freeglut_return_if_fail( fgStructure.Window );
-    vis = FETCH_WCB( ( *( fgStructure.Window ) ), Visibility );
-    freeglut_return_if_fail( vis );
 
-    if( status == GLUT_HIDDEN  || status == GLUT_FULLY_COVERED )
+    if( ( GLUT_HIDDEN == status )  || ( GLUT_FULLY_COVERED == status ) )
         glut_status = GLUT_NOT_VISIBLE;
-    else
-        glut_status = GLUT_VISIBLE;
-    vis( glut_status );
+    INVOKE_WCB( *( fgStructure.Window ), Visibility, ( glut_status ) );
 }
 
 void FGAPIENTRY glutVisibilityFunc( void (* callback)( int ) )
@@ -232,9 +227,8 @@ void FGAPIENTRY glutWMCloseFunc( void (* callback)( void ) )
 /* A. Donev: Destruction callback for menus */
 void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) )
 {
-    if( fgStructure.Menu == NULL )
-        return;
-    fgStructure.Menu->Destroy = callback;
+    if( fgStructure.Menu )
+        fgStructure.Menu->Destroy = callback;
 }
 
 /*