X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_main.c;h=f409b330d3745805bdf0fa0467f53b6e09a171aa;hb=e3ca92b25a88aae086386edcf0141b3340be723c;hp=71902729704b4f4ccf4bd1d05f2e5754967d9acf;hpb=a857e58176328995447a10addf3ea74f54fe63ae;p=freeglut diff --git a/src/fg_main.c b/src/fg_main.c index 7190272..f409b33 100644 --- a/src/fg_main.c +++ b/src/fg_main.c @@ -54,7 +54,7 @@ # define MIN(a,b) (((a)<(b)) ? (a) : (b)) #endif -extern void fgPlatformProcessWork ( SFG_Window *window ); +extern void fgProcessWork ( SFG_Window *window ); extern fg_time_t fgPlatformSystemTime ( void ); extern void fgPlatformSleepForEvents( fg_time_t msec ); extern void fgPlatformProcessSingleEvent ( void ); @@ -163,7 +163,7 @@ static void fghcbProcessWork( SFG_Window *window, SFG_Enumerator *enumerator ) { if( window->State.WorkMask ) - fgPlatformProcessWork ( window ); + fgProcessWork ( window ); fgEnumSubWindows( window, fghcbProcessWork, enumerator ); } @@ -393,7 +393,7 @@ static void fghSleepForEvents( void ) /* Step through the work list */ -void fgPlatformProcessWork(SFG_Window *window) +void fgProcessWork(SFG_Window *window) { unsigned int workMask = window->State.WorkMask; /* Now clear it so that any callback generated by the actions below can set work again */ @@ -465,6 +465,13 @@ void FGAPIENTRY glutMainLoopEvent( void ) /* Perform work on the window (position, reshape, display, etc) */ fghProcessWork( ); + /* Check OpenGL error state if requested. + * Don't call if no more open windows (can happen if user closes window from + * title bar), would lead to infinite error loop in glutReportErrors + */ + if (fgState.GLDebugSwitch && fgStructure.CurrentWindow) + glutReportErrors( ); + fgCloseWindows( ); }