Merge remote-tracking branch 'svn/trunk' into git_master

This commit is contained in:
Diederick C. Niehorster 2017-05-26 12:25:30 +02:00
commit 40a20ed2b1
2 changed files with 8 additions and 6 deletions

View File

@ -482,11 +482,13 @@ void FGAPIENTRY glutMainLoop( void )
fgPlatformMainLoopPreliminaryWork (); fgPlatformMainLoopPreliminaryWork ();
fgState.ExecState = GLUT_EXEC_STATE_RUNNING ; fgState.ExecState = GLUT_EXEC_STATE_RUNNING ;
while( fgState.ExecState == GLUT_EXEC_STATE_RUNNING ) for(;;)
{ {
SFG_Window *window; SFG_Window *window;
glutMainLoopEvent( ); glutMainLoopEvent( );
if( fgState.ExecState != GLUT_EXEC_STATE_RUNNING )
break;
/* /*
* Step through the list of windows, seeing if there are any * Step through the list of windows, seeing if there are any
* that are not menus * that are not menus