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

Set state before we write packets to event so that the event knows that it is alarmed

This commit is contained in:
Isaac Connor 2021-03-02 11:47:55 -05:00
parent f8b7ec8cb9
commit c03d9b2987
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zm_monitor.cpp
View File

@ -2079,6 +2079,12 @@ bool Monitor::Analyse() {
ZMPacket *starting_packet = *(*start_it);
event = new Event(this, *(starting_packet->timestamp), cause, noteSetMap);
shared_data->last_event_id = event->Id();
//set up video store data
snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
video_store_data->recording = event->StartTime();
shared_data->state = state = ALARM;
// Write out starting packets, do not modify packetqueue it will garbage collect itself
while ( *start_it != snap_it ) {
event->AddPacket(starting_packet);
@ -2096,12 +2102,6 @@ bool Monitor::Analyse() {
delete start_it;
start_it = nullptr;
shared_data->last_event_id = event->Id();
//set up video store data
snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
video_store_data->recording = event->StartTime();
shared_data->state = state = ALARM;
Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name, analysis_image_count, event->Id());
} // end if no event, so start it
if ( alarm_frame_count ) {