From 1e38cf8bb7721b0cce7e3c323dd7b81a732eb949 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 25 Oct 2021 16:40:21 -0400
Subject: [PATCH] Fix monitor type labels by adding an Unknown for entry 0. 
 Implement Function_Strings. Fix decoding_enabled not being recalculated
 correctly because we havn't loaded savejpegs or videowriter yet.

---
 src/zm_monitor.cpp | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index e85330eb2..93ae2d026 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -86,6 +86,7 @@ std::string load_monitor_sql =
 "`SignalCheckPoints`, `SignalCheckColour`, `Importance`-1 FROM `Monitors`";
 
 std::string CameraType_Strings[] = {
+  "Unknown",
   "Local",
   "Remote",
   "File",
@@ -93,10 +94,21 @@ std::string CameraType_Strings[] = {
   "LibVLC",
   "NVSOCKET",
   "CURL",
-  "VNC",
+  "VNC"
+};
+
+std::string Function_Strings[] = {
+  "Unknown",
+  "None",
+  "Monitor",
+  "Modect",
+  "Record",
+  "Mocord",
+  "Nodect"
 };
 
 std::string State_Strings[] = {
+  "Unknown",
   "IDLE",
   "PREALARM",
   "ALARM",
@@ -474,16 +486,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   function = (Function)atoi(dbrow[col]); col++;
   enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
   decoding_enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
-  decoding_enabled = !(
-      ( function == RECORD or function == NODECT )
-      and
-      ( savejpegs == 0 )
-      and
-      ( videowriter == PASSTHROUGH )
-      and
-      !decoding_enabled
-      );
-  Debug(1, "Decoding enabled: %d", decoding_enabled);
+  // See below after save_jpegs for a recalculation of decoding_enabled
 
   ReloadLinkedMonitors(dbrow[col]); col++;
 
@@ -552,6 +555,17 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   videowriter = (VideoWriter)atoi(dbrow[col]); col++;
   encoderparams = dbrow[col] ? dbrow[col] : ""; col++;
 
+  decoding_enabled = !(
+      ( function == RECORD or function == NODECT )
+      and
+      ( savejpegs == 0 )
+      and
+      ( videowriter == PASSTHROUGH )
+      and
+      !decoding_enabled
+      );
+  Debug(3, "Decoding enabled: %d function %d %s savejpegs %d videowriter %d", decoding_enabled, function, Function_Strings[function].c_str(), savejpegs, videowriter);
+
 /*"`OutputCodec`, `Encoder`, `OutputContainer`, " */
   output_codec = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
   encoder = dbrow[col] ? dbrow[col] : ""; col++;