Fixing bug report 2952457 -- modifying the "FREEGLUT_EXIT_IF_NO_WINDOW" macro so that it does not exit if the user has specified "GLUT_ACTION_CONTINUE_EXECUTION".

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@887 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2011-01-23 22:30:13 +00:00
parent d8c52fb066
commit b542912840

View File

@ -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) ) ; \
}
/*