Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

diff --git a/docs/modelers.html b/docs/modelers.html
index b93f4d8b76013faaa0bb04c6d859b53f0c1e1712..aae968695940ea9c83f4e8332e106c7a53454538 100644 (file)
--- a/docs/modelers.html
+++ b/docs/modelers.html
@@ -28,7 +28,7 @@
        </li><li><a href="http://innovation3d.sourceforge.net/" target="_parent">Innovation3D</a>
        - 3D modeling program
        </li><li><a href="http://mesa3d.sourceforge.net/notfound.html" target="_parent">KWRL</a> - VRML browser
-       </li><li><a href="http://www.vermontel.com/%7Ecmorley/vrml.html" target="_parent">LibVRML97/Lookat</a>
+       </li><li><a href="http://www.openvrml.org/" target="_parent">LibVRML97/Lookat</a>
        - VRML viewer
        </li><li><a href="http://aig.cs.man.ac.uk/systems/Maverik/" target="_parent">Maverik</a>
        - VR graphics and interaction system

diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c
index 0a96e8cf71de932b5229a8051bd821c4aa511c0f..b5df7b23119d93c5f0416231d65e31dabe952aaf 100644 (file)
--- a/src/glut/glx/glut_event.c
+++ b/src/glut/glx/glut_event.c
@@ -172,10 +172,14 @@ handleTimeouts(void)
   GETTIMEOFDAY(&now);
   while (IS_AT_OR_AFTER(__glutTimerList->timeout, now)) {
     timer = __glutTimerList;
-    __glutTimerList = timer->next;
+    /* call the timer function */
     timer->func(timer->value);
+    /* remove from the linked list */
+    __glutTimerList = timer->next;
+    /* put this timer on the "free" list */
     timer->next = freeTimerList;
     freeTimerList = timer;
+
     if (!__glutTimerList)
       break;
   }