ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

If shm size is 0 don't log an error

pull/4170/head
Isaac Connor 2024-10-04 14:35:06 -04:00
parent 3d3ece315b
commit 6e1e077a90
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
View File

@ -287,9 +287,16 @@ sub zmMemVerify {
my $sd_size = zmMemRead($monitor, 'shared_data:size', 1); my $sd_size = zmMemRead($monitor, 'shared_data:size', 1);
if ($sd_size != $mem_data{shared_data}->{size}) { if ($sd_size != $mem_data{shared_data}->{size}) {
Error('Shared data size conflict in shared_data for monitor ' if ($mem_data{shared_data}->{size}) {
.$monitor->{Name}.', expected '.$mem_data{shared_data}->{size} Error('Shared data size conflict in shared_data for monitor '
.', got '.$sd_size); .$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; return undef;
} else { } else {
Debug(4, 'Shared data size match for monitor '.$monitor->{Name} Debug(4, 'Shared data size match for monitor '.$monitor->{Name}