strip out GLUT_DISPLAY_CALLBACK from worklist _before_ calling display callback....

[freeglut] / src / fg_main.c

diff --git a/src/fg_main.c b/src/fg_main.c
index 3b32f06..7190272 100644 (file)
--- a/src/fg_main.c
+++ b/src/fg_main.c
@@ -432,13 +432,17 @@ void fgPlatformProcessWork(SFG_Window *window)
         }
     }
 
-    if (workMask & GLUT_DISPLAY_WORK)
+    /* check window state's workmask as well as some of the above callbacks might have generated redisplay requests. We can deal with those right now instead of wait for the next mainloop iteration. */
+    if (workMask & GLUT_DISPLAY_WORK || window->State.WorkMask & GLUT_DISPLAY_WORK)
     {
         if( window->State.Visible )
-            fghRedrawWindow ( window );
+        {
+            /* Strip out display work from the work list */
+            /* NB: do this before the display callback is called as user might call postredisplay in his display callback */
+            window->State.WorkMask &= ~GLUT_DISPLAY_WORK;
 
-        /* Strip out display work that might have ended up on work list now as some of the above genereates callbacks */
-        window->State.WorkMask &= ~GLUT_DISPLAY_WORK;
+            fghRedrawWindow ( window );
+        }
     }
 }