[Gnash-commit] gnash/gui NullGui.cpp

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/07/03 15:41:27

Modified files:
        gui            : NullGui.cpp 

Log message:
        fix timeout that broke with last commit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/NullGui.cpp?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: NullGui.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/NullGui.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- NullGui.cpp 3 Jul 2007 15:17:32 -0000       1.11
+++ NullGui.cpp 3 Jul 2007 15:41:26 -0000       1.12
@@ -35,7 +35,6 @@
 #include <sys/time.h> // for gettimeofday
 #include <time.h> // for gettimeofday
 #include <errno.h> // for reporting gettimeofday errors
-#include "tu_timer.h"
 
 namespace gnash
 {
@@ -70,15 +69,6 @@
                        }
                        timer = tv.tv_sec*1000 + tv.tv_usec / 1000;
                        
-                       
-               if ( _timeout )
-               {
-                       if ( timer - start_timer > _timeout)
-                       {
-                               break;
-                       }
-               }
-               
                if (_interval==1)
                  break; // special exception for 1 ms interval (run as fast as 
possible)
 
@@ -92,6 +82,15 @@
        
        }
        
+    if ( _timeout )
+    {
+      if ( timer - start_timer > _timeout)
+      {
+        break;
+      }
+    }
+    
+    
        prevtimer = timer;