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

SHould reset state as well as shared_data->state

This commit is contained in:
Isaac Connor 2021-05-31 15:59:36 -04:00
parent d2941d6b87
commit c686fa5949
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_monitor.cpp
View File

@ -1009,7 +1009,7 @@ bool Monitor::connect() {
shared_data->signal = false; shared_data->signal = false;
shared_data->capture_fps = 0.0; shared_data->capture_fps = 0.0;
shared_data->analysis_fps = 0.0; shared_data->analysis_fps = 0.0;
shared_data->state = IDLE; shared_data->state = state = IDLE;
shared_data->last_write_index = image_buffer_count; shared_data->last_write_index = image_buffer_count;
shared_data->last_read_index = image_buffer_count; shared_data->last_read_index = image_buffer_count;
shared_data->last_write_time = 0; shared_data->last_write_time = 0;
@ -2253,7 +2253,7 @@ bool Monitor::Analyse() {
shared_data->last_frame_score = score; shared_data->last_frame_score = score;
} else { } else {
Debug(3, "trigger == off"); Debug(3, "trigger == off");
if ( event ) { if (event) {
Info("%s: %03d - Closing event %" PRIu64 ", trigger off", name.c_str(), analysis_image_count, event->Id()); Info("%s: %03d - Closing event %" PRIu64 ", trigger off", name.c_str(), analysis_image_count, event->Id());
closeEvent(); closeEvent();
} }
@ -2277,7 +2277,7 @@ bool Monitor::Analyse() {
// Only do these if it's a video packet. // Only do these if it's a video packet.
shared_data->last_read_index = snap->image_index; shared_data->last_read_index = snap->image_index;
analysis_image_count++; analysis_image_count++;
if ( function == MODECT or function == MOCORD ) if (function == MODECT or function == MOCORD)
UpdateAnalysisFPS(); UpdateAnalysisFPS();
} }
packetqueue.unlock(packet_lock); packetqueue.unlock(packet_lock);