From e09c80e38508a0dae7daba46db59242773611067 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 2 Feb 2021 14:23:54 -0500
Subject: [PATCH] Have to close camera AFTER threads have stopped

---
 src/zmc.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/zmc.cpp b/src/zmc.cpp
index 9feb0ed6e..f963e514c 100644
--- a/src/zmc.cpp
+++ b/src/zmc.cpp
@@ -283,7 +283,7 @@ int main(int argc, char *argv[]) {
 
 #if HAVE_RTSP_SERVER
     RTSPServerThread ** rtsp_server_threads = nullptr;
-    if ( config.min_rtsp_port ) {
+    if ( config.min_rtsp_port and monitors[0]->RTSPServer() ) {
       rtsp_server_threads = new RTSPServerThread *[n_monitors];
       Debug(1, "Starting RTSP server because min_rtsp_port is set");
     } else {
@@ -405,24 +405,28 @@ int main(int argc, char *argv[]) {
 
     for ( int i = 0; i < n_monitors; i++ ) {
       monitors[i]->Close();
-    }
 
     // Killoff the analysis threads. Don't need them spinning while we try to reconnect
-    for ( int i = 0; i < n_monitors; i++ ) {
       if ( analysis_threads[i] ) {
         analysis_threads[i]->join();
         delete analysis_threads[i];
         analysis_threads[i] = nullptr;
       }
-    } // end foreach monitor
-    delete [] analysis_threads;
 #if HAVE_RTSP_SERVER
-    if ( rtsp_server_threads ) {
-      for ( int i = 0; i < n_monitors; i++ ) {
+      if ( rtsp_server_threads ) {
         rtsp_server_threads[i]->join();;
         delete rtsp_server_threads[i];
         rtsp_server_threads[i] = nullptr;
       }
+#endif
+      Camera *camera = monitors[i]->getCamera();
+      Debug(1, "Closing camera");
+      camera->Close();
+    }
+
+    delete [] analysis_threads;
+#if HAVE_RTSP_SERVER
+    if ( rtsp_server_threads ) {
       delete[] rtsp_server_threads;
       rtsp_server_threads = nullptr;
     }