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:
parent
d8c52fb066
commit
b542912840
@ -801,11 +801,12 @@ extern SFG_State fgState;
|
|||||||
* A call to those macros assures us that there is a current
|
* A call to those macros assures us that there is a current
|
||||||
* window set, respectively:
|
* window set, respectively:
|
||||||
*/
|
*/
|
||||||
#define FREEGLUT_EXIT_IF_NO_WINDOW( string ) \
|
#define FREEGLUT_EXIT_IF_NO_WINDOW( string ) \
|
||||||
if ( ! fgStructure.CurrentWindow ) \
|
if ( ! fgStructure.CurrentWindow && \
|
||||||
{ \
|
( fgState.ActionOnWindowClose != GLUT_ACTION_CONTINUE_EXECUTION ) ) \
|
||||||
fgError ( " ERROR: Function <%s> called" \
|
{ \
|
||||||
" with no current window defined.", (string) ) ; \
|
fgError ( " ERROR: Function <%s> called" \
|
||||||
|
" with no current window defined.", (string) ) ; \
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user