From b70c064bf91ef8fbe2423d6d53b4e5f02a4d5d50 Mon Sep 17 00:00:00 2001 From: stan Date: Thu, 12 Jan 2006 17:07:26 +0000 Subject: [PATCH] Bug 250 - Fixed negative timeouts becoming very long timeouts. git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1792 e3e1d417-86f3-4887-817a-d78f3d33393f --- src/zm_event.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/zm_event.cpp b/src/zm_event.cpp index 0f48de746..b0c435e37 100644 --- a/src/zm_event.cpp +++ b/src/zm_event.cpp @@ -471,7 +471,11 @@ void Event::StreamEvent( int event_id, int frame_id, int scale, int rate, int ma if ( (frame_mod == 1) || (((id-1)%frame_mod) == 0) ) { double this_delta = last_db_delta+(((id-last_db_id)*(db_delta-last_db_delta))/(db_id-last_db_id)); - delta_us = (unsigned int)((this_delta-last_delta) * 1000000); + if (this_delta > last_delta) + delta_us = (unsigned int)((this_delta-last_delta) * 1000000); + else + delta_us = 0; + if ( rate != ZM_RATE_SCALE ) delta_us = (delta_us*ZM_RATE_SCALE)/rate; Debug( 2, ( "I:%d, DI:%d, LDBI:%d, DD:%lf, LD:%lf, LDBD:%lf, TD:%lf, DU:%d", id, db_id, last_db_id, db_delta, last_delta, last_db_delta, this_delta, delta_us ));