FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit of John's change to stop an infinite-loop condition when the

Browse Source 
only windows left are freeglut menu windows, and correctly calls exit()
if we drop out of the main loop without having requested any freeglut
extensions to glutMainLoop() handling.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@382 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-12-10 23:59:45 +00:00
parent 3ae658e166
commit d4f3ec79de
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
freeglut/freeglut/src/freeglut_main.c
View File

@ -1088,16 +1088,27 @@ void FGAPIENTRY glutMainLoop( void )
fgState.ExecState = GLUT_EXEC_STATE_RUNNING ; fgState.ExecState = GLUT_EXEC_STATE_RUNNING ;
while( fgState.ExecState == GLUT_EXEC_STATE_RUNNING ) while( fgState.ExecState == GLUT_EXEC_STATE_RUNNING )
{ {
glutMainLoopEvent( ); SFG_Window *window;
if( fgStructure.Windows.First == NULL ) glutMainLoopEvent( );
/*
* Step through the list of windows, seeing if there are any
* that are not menus
*/
for( window = ( SFG_Window * )fgStructure.Windows.First;
window;
window = ( SFG_Window * )window->Node.Next )
if ( ! ( window->IsMenu ) )
break;
if( ! window )
fgState.ExecState = GLUT_EXEC_STATE_STOP; fgState.ExecState = GLUT_EXEC_STATE_STOP;
else else
{ {
if( fgState.IdleCallback ) if( fgState.IdleCallback )
fgState.IdleCallback( ); fgState.IdleCallback( );
fgSleepForEvents(); fgSleepForEvents( );
} }
} }
@ -1106,6 +1117,8 @@ void FGAPIENTRY glutMainLoop( void )
* of a freeglut session, so that another glutInit() call can happen * of a freeglut session, so that another glutInit() call can happen
*/ */
fgDeinitialize( ); fgDeinitialize( );
if( fgState.ActionOnWindowClose == GLUT_ACTION_EXIT )
exit( 0 );
} }
/* /*