fix merge

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