Implementing John Tsiombikas' missing error demo patch per e-mail dated 3/15/11 8...

[freeglut] / src / freeglut_init.c

diff --git a/src/freeglut_init.c b/src/freeglut_init.c
index 2cc19ea..bbe9ec8 100644 (file)
--- a/src/freeglut_init.c
+++ b/src/freeglut_init.c
@@ -389,6 +389,7 @@ static void fghInitialize( const char* displayName )
 #endif
 
     fgState.Initialised = GL_TRUE;
+    atexit(fgDeinitialize);
 
     /* InputDevice uses GlutTimerFunc(), so fgState.Initialised must be TRUE */
     fgInitialiseInputDevices();
@@ -403,8 +404,6 @@ void fgDeinitialize( void )
 
     if( !fgState.Initialised )
     {
-        fgWarning( "fgDeinitialize(): "
-                   "no valid initialization has been performed" );
         return;
     }
 
@@ -1162,7 +1161,7 @@ void FGAPIENTRY glutInitErrorFunc( void (* vfgError) ( const char *fmt, va_list
 void FGAPIENTRY glutInitWarningFunc( void (* vfgWarning) ( const char *fmt, va_list ap ) )
 {
     /* This allows user programs to handle freeglut warnings */
-    fgState.ErrorFunc = vfgWarning;
+    fgState.WarningFunc = vfgWarning;
 }
 
 /*** END OF FILE ***/