From aef0cc55ebeccdc6572f71bf2c9eb39776d51ef2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 20 Oct 2020 18:27:03 -0400 Subject: [PATCH] fix merge --- src/zm_event.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zm_event.cpp b/src/zm_event.cpp index 373fa0dff..e8821b1eb 100644 --- a/src/zm_event.cpp +++ b/src/zm_event.cpp @@ -681,7 +681,7 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a // The idea is to write out 1/sec frame_data.push(new Frame(id, frames, frame_type, timestamp, delta_time, score)); double fps = monitor->get_capture_fps(); - if ( write_to_db or ( monitor->get_fps() and (frame_data.size() > monitor->get_fps())) or frame_type==BULK ) { + if ( write_to_db or ( fps and (frame_data.size() > fps) ) or frame_type==BULK ) { Debug(1, "Adding %d frames to DB because write_to_db:%d or frames > capture fps %f or BULK", frame_data.size(), write_to_db, fps); WriteDbFrames();