ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved state transitions to before actions. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1741 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2005-12-27 14:40:15 +00:00
parent 0409cad90f
commit d0e3247db9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/zm_monitor.cpp
View File

@ -809,6 +809,8 @@ bool Monitor::Analyse()
}
if ( !event )
{
shared_data->state = state = TAPE;
// Create event
event = new Event( this, *timestamp, "Continuous" );
shared_data->last_event = event->Id();
@ -830,7 +832,6 @@ bool Monitor::Analyse()
}
event->AddFrames( pre_event_count, images, timestamps );
}
shared_data->state = state = TAPE;
}
}
if ( score )
@ -840,6 +841,7 @@ bool Monitor::Analyse()
if ( Event::PreAlarmCount() >= (alarm_frame_count-1) )
{
Info(( "%s: %03d - Gone into alarm state", name, image_count ));
shared_data->state = state = ALARM;
if ( function != MOCORD && state != ALERT )
{
int pre_index;
@ -872,7 +874,6 @@ bool Monitor::Analyse()
event->SavePreAlarmFrames();
}
}
shared_data->state = state = ALARM;
}
else if ( state != PREALARM )
{