[Gnash-commit] gnash ChangeLog server/timers.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/04 08:10:27

Modified files:
        .              : ChangeLog 
        server         : timers.cpp 

Log message:
                * server/timers.cpp (expired): allow now == _start.
                  Hopefully fixes bug #20047.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3442&r2=1.3443
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3442
retrieving revision 1.3443
diff -u -b -r1.3442 -r1.3443
--- ChangeLog   3 Jun 2007 18:17:18 -0000       1.3442
+++ ChangeLog   4 Jun 2007 08:10:26 -0000       1.3443
@@ -1,3 +1,8 @@
+2007-06-04 Sandro Santilli <address@hidden>
+
+       * server/timers.cpp (expired): allow now == _start.
+         Hopefully fixes bug #20047.
+
 2007-06-02 Sandro Santilli <address@hidden>
 
        * server/asobj/NetStream.cpp (::bufferLength): return milliseconds,

Index: server/timers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/timers.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/timers.cpp   2 Jun 2007 18:19:54 -0000       1.32
+++ server/timers.cpp   4 Jun 2007 08:10:27 -0000       1.33
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: timers.cpp,v 1.32 2007/06/02 18:19:54 strk Exp $ */
+/* $Id: timers.cpp,v 1.33 2007/06/04 08:10:27 strk Exp $ */
 
 #include "timers.h"
 #include "as_function.h" // for class as_function
@@ -91,11 +91,7 @@
        if (_start)
        {
                uint64_t now = tu_timer::get_profile_ticks();
-               if (now <= _start)
-               {
-                       log_debug("now: %lu, _start: %lu (aborting)", now, 
_start);
-                       abort();
-               }
+               assert(now >= _start); // it is possible for now to be == 
_start 
 
                //printf("FIXME: %s: now is %f, start time is %f, interval is 
%f\n", __FUNCTION__, now, _start, _interval);
                if (now > _start + _interval)