X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_internal.h;h=2a5a4db0c95b2812557821bc182a78cf77641d75;hb=97e842e50bcf77fb81f83de8d6983e0ddfa0b6d6;hp=ed01830883777ae7820652a839232249a6c68cf9;hpb=72af7eeaf8e2c2ecf8949137cfea2030069b1dd8;p=freeglut diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h index ed01830..2a5a4db 100644 --- a/src/freeglut_internal.h +++ b/src/freeglut_internal.h @@ -801,11 +801,12 @@ extern SFG_State fgState; * A call to those macros assures us that there is a current * window set, respectively: */ -#define FREEGLUT_EXIT_IF_NO_WINDOW( string ) \ - if ( ! fgStructure.CurrentWindow ) \ - { \ - fgError ( " ERROR: Function <%s> called" \ - " with no current window defined.", (string) ) ; \ +#define FREEGLUT_EXIT_IF_NO_WINDOW( string ) \ + if ( ! fgStructure.CurrentWindow && \ + ( fgState.ActionOnWindowClose != GLUT_ACTION_CONTINUE_EXECUTION ) ) \ + { \ + fgError ( " ERROR: Function <%s> called" \ + " with no current window defined.", (string) ) ; \ } /* @@ -825,7 +826,7 @@ void fgDestroyStructure( void ); /* A helper function to check if a display mode is possible to use */ #if TARGET_HOST_POSIX_X11 -GLXFBConfig* fgChooseFBConfig( void ); +GLXFBConfig* fgChooseFBConfig( int* numcfgs ); #endif /* The window procedure for Win32 events handling */