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

wait to closeEvent on monitor shutdown

This commit is contained in:
Isaac Connor 2018-03-28 14:03:56 -04:00
parent 4be64152e8
commit b22911f554
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zm_monitor.cpp
View File

@ -620,11 +620,6 @@ Debug(3, "Success connecting");
} }
Monitor::~Monitor() { Monitor::~Monitor() {
if ( event_delete_thread ) {
event_delete_thread->join();
delete event_delete_thread;
event_delete_thread = NULL;
}
if ( timestamps ) { if ( timestamps ) {
delete[] timestamps; delete[] timestamps;
timestamps = 0; timestamps = 0;
@ -641,6 +636,13 @@ Monitor::~Monitor() {
if ( event ) { if ( event ) {
Info( "%s: image_count:%d - Closing event %d, shutting down", name, image_count, event->Id() ); Info( "%s: image_count:%d - Closing event %d, shutting down", name, image_count, event->Id() );
closeEvent(); closeEvent();
// closeEvent may start another thread to close the event, so wait for it to finish
if ( event_delete_thread ) {
event_delete_thread->join();
delete event_delete_thread;
event_delete_thread = NULL;
}
} }
if ( (deinterlacing & 0xff) == 4) { if ( (deinterlacing & 0xff) == 4) {