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

Fix some type errors and remove an unneeded call to onCreateEvent

This commit is contained in:
Emmanuel Papin 2015-02-15 14:58:51 +01:00
parent e7b1ab54df
commit 8610f48afd
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_image_analyser.cpp
View File

@ -499,7 +499,7 @@ void ImageAnalyser::cleanupPlugins()
if ( mysql_query( &dbconn, sql ) ) if ( mysql_query( &dbconn, sql ) )
{ {
Error( "Can't delete plugint: %s", mysql_error( &dbconn ) ); Error( "Can't delete plugin: %s", mysql_error( &dbconn ) );
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
} }

7
src/zm_monitor.cpp
View File

@ -1449,7 +1449,7 @@ bool Monitor::Analyse()
} }
} }
else else
event->AddCause( det_cause ); event->AddCause( det_cause );
} }
} }
#endif // ZM_PLUGINS_ON #endif // ZM_PLUGINS_ON
@ -1520,10 +1520,7 @@ bool Monitor::Analyse()
// Create event // Create event
event = new Event( this, *timestamp, "Continuous", noteSetMap ); event = new Event( this, *timestamp, "Continuous", noteSetMap );
shared_data->last_event = event->Id(); shared_data->last_event = event->Id();
#if ZM_PLUGINS_ON
if (config.load_plugins)
ThePluginManager.getImageAnalyser().onCreateEvent( zones, event );
#endif // ZM_PLUGINS_ON
Info( "%s: %03d - Opening new event %d, section start", name, image_count, event->Id() ); Info( "%s: %03d - Opening new event %d, section start", name, image_count, event->Id() );
/* To prevent cancelling out an existing alert\prealarm\alarm state */ /* To prevent cancelling out an existing alert\prealarm\alarm state */