ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into multistream

This commit is contained in:
Isaac Connor 2022-01-13 10:21:58 -05:00
parent e4f0c7cd98 162e12bf92
commit 3cc1b74b4e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/zmupdate.pl.in
View File

@ -96,7 +96,7 @@ my $use_log = (($> == 0) || ($> == $web_uid));
logInit( toFile=>$use_log?DEBUG:NOLOG ); logInit( toFile=>$use_log?DEBUG:NOLOG );
logSetSignal(); logSetSignal();
my $interactive = 1; my $interactive = -t STDERR; # interactive if we have IO
my $check = 0; my $check = 0;
my $freshen = 0; my $freshen = 0;
my $rename = 0; my $rename = 0;
@ -144,7 +144,7 @@ if ( ($check + $freshen + $rename + $zoneFix + $migrateEvents + ($version?1:0))
pod2usage(-exitstatus => -1); pod2usage(-exitstatus => -1);
} }
if ($check and ($Config{ZM_CHECK_FOR_UPDATES} or $interactive) ) { if ($check) {
if (!$interactive) { if (!$interactive) {
Info('Update agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime() )."\n"); Info('Update agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime() )."\n");
} }

4
src/zm_monitor.cpp
View File

@ -1095,7 +1095,7 @@ bool Monitor::connect() {
//ONVIF Setup //ONVIF Setup
#ifdef WITH_GSOAP #ifdef WITH_GSOAP
ONVIF_Trigger_State = FALSE; ONVIF_Trigger_State = FALSE;
if (onvif_event_listener) { //Temporarily using this option to enable the feature if (onvif_event_listener) {
Debug(1, "Starting ONVIF"); Debug(1, "Starting ONVIF");
ONVIF_Healthy = FALSE; ONVIF_Healthy = FALSE;
if (onvif_options.find("closes_event") != std::string::npos) { //Option to indicate that ONVIF will send a close event message if (onvif_options.find("closes_event") != std::string::npos) { //Option to indicate that ONVIF will send a close event message
@ -3138,7 +3138,7 @@ int Monitor::PrimeCapture() {
#ifdef WITH_GSOAP //For now, just don't run the thread if no ONVIF support. This may change if we add other long polling options. #ifdef WITH_GSOAP //For now, just don't run the thread if no ONVIF support. This may change if we add other long polling options.
//ONVIF Thread //ONVIF Thread
if (onvif_event_listener) { if (onvif_event_listener && ONVIF_Healthy) {
if (!Poller) { if (!Poller) {
Poller = zm::make_unique<PollThread>(this); Poller = zm::make_unique<PollThread>(this);
} else { } else {