mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-27 16:58:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multistream

Browse Source
This commit is contained in:
Isaac Connor committed 2022-01-05 18:03:44 -05:00
2 parents a250567e74 a76128e9c4
commit aefed4e174
12 files changed
+56 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

scripts/zmfilter.pl.in
+1 -1
View File
@@ -184,7 +184,7 @@ while (!$zm_terminate) {
foreach my $filter (@filters) {
last if $zm_terminate;
my $elapsed = ($now - $$filter{last_ran});
my $elapsed = ($now - ($$filter{last_ran} ? $$filter{last_ran} : 0));
if ($$filter{last_ran} and ($elapsed < $$filter{ExecuteInterval})) {
my $filter_delay = $$filter{ExecuteInterval} - ($now - $$filter{last_ran});
$delay = $filter_delay if $filter_delay < $delay;