From 33ff712f2c3d3ea420f7956e2f554982f9d7fcf8 Mon Sep 17 00:00:00 2001 From: SteveGilvarry Date: Tue, 2 Dec 2014 22:36:32 +1100 Subject: [PATCH] Resolve post merge build issues with braces --- src/zm_event.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/zm_event.cpp b/src/zm_event.cpp index ebcf0be9a..181e6b382 100755 --- a/src/zm_event.cpp +++ b/src/zm_event.cpp @@ -607,7 +607,7 @@ void Event::AddFramesInternal( int n_frames, int start_frame, Image **images, st static char event_file[PATH_MAX]; snprintf( event_file, sizeof(event_file), capture_file_format, path, frames ); /* FIXME Comeback and fix either videoEvent or videowriter not both */ - if(videoEvent){ + if(videoEvent){ //If this is the first frame, we should add a thumbnail to the event directory if(frames == 10){ char snapshot_file[PATH_MAX]; @@ -615,11 +615,11 @@ void Event::AddFramesInternal( int n_frames, int start_frame, Image **images, st WriteFrameImage( images[i], *(timestamps[i]), snapshot_file ); } }else{ - Debug( 1, "Writing pre-capture frame %d", frames ); - if ( monitor->GetOptSaveJPEGs() & 1) { + Debug( 1, "Writing pre-capture frame %d", frames ); + if ( monitor->GetOptSaveJPEGs() & 1) { WriteFrameImage( images[i], *(timestamps[i]), event_file ); + } } - if ( videowriter != NULL ) { WriteFrameVideo( images[i], *(timestamps[i]), videowriter ); } @@ -673,10 +673,10 @@ void Event::AddFrame( Image *image, struct timeval timestamp, int score, Image * }else{ Debug( 1, "Writing capture frame %d", frames ); - if( monitor->GetOptSaveJPEGs() & 1) { - WriteFrameImage( image, timestamp, event_file ); + if( monitor->GetOptSaveJPEGs() & 1) { + WriteFrameImage( image, timestamp, event_file ); + } } - if ( videowriter != NULL ) { WriteFrameVideo( image, timestamp, videowriter ); }