mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-30 19:52:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Isaac Connor
2020-10-20 18:27:03 -04:00
parent 2eda49333f
commit aef0cc55eb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_event.cpp
View File

@@ -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();