If shm size is 0 don't log an error

ZoneMinder · Oct 4, 2024 · 6e1e077 · 6e1e077
1 parent 3d3ece3
commit 6e1e077
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
@@ -287,9 +287,16 @@ sub zmMemVerify {
 
   my $sd_size = zmMemRead($monitor, 'shared_data:size', 1);
   if ($sd_size != $mem_data{shared_data}->{size}) {
-    Error('Shared data size conflict in shared_data for monitor '
-      .$monitor->{Name}.', expected '.$mem_data{shared_data}->{size}
-      .', got '.$sd_size);
+    if ($mem_data{shared_data}->{size}) {
+      Error('Shared data size conflict in shared_data for monitor '
+        .$monitor->{Name}.', expected '.$mem_data{shared_data}->{size}
+        .', got '.$sd_size);
+    } else {
+      # Means it may be starting up/reloading, not really an error
+      Debug('Shared data size conflict in shared_data for monitor '
+        .$monitor->{Name}.', expected '.$mem_data{shared_data}->{size}
+        .', got '.$sd_size);
+    }
     return undef;
   } else {
     Debug(4, 'Shared data size match for monitor '.$monitor->{Name}