Must stop threads before Closing monitor

This commit is contained in:
Isaac Connor 2020-12-27 12:04:35 -05:00
parent a440ab3ef0
commit c8d2eb9c0f
1 changed files with 8 additions and 7 deletions

View File

@ -383,13 +383,6 @@ int main(int argc, char *argv[]) {
zm_reload = false; zm_reload = false;
} // end if zm_reload } // end if zm_reload
} // end while ! zm_terminate and connected } // end while ! zm_terminate and connected
for ( int i = 0; i < n_monitors; i++ ) {
monitors[i]->Close();
}
delete [] alarm_capture_delays;
delete [] capture_delays;
delete [] last_capture_times;
// Killoff the analysis threads. Don't need them spinning while we try to reconnect // Killoff the analysis threads. Don't need them spinning while we try to reconnect
for ( int i = 0; i < n_monitors; i++ ) { for ( int i = 0; i < n_monitors; i++ ) {
@ -402,6 +395,14 @@ int main(int argc, char *argv[]) {
} // end foreach monitor } // end foreach monitor
delete [] analysis_threads; delete [] analysis_threads;
for ( int i = 0; i < n_monitors; i++ ) {
monitors[i]->Close();
}
delete [] alarm_capture_delays;
delete [] capture_delays;
delete [] last_capture_times;
} // end while ! zm_terminate outer connection loop } // end while ! zm_terminate outer connection loop
Debug(1,"Updating Monitor status"); Debug(1,"Updating Monitor status");