From ccc6424454bcf3b7b72ef636c9999d8f0ccedb09 Mon Sep 17 00:00:00 2001 From: DS_Starter Date: Mon, 20 Nov 2017 08:26:06 +0000 Subject: [PATCH] 49_SSCam: V3.2.4, don't retrieve presets during restart if cam is disabled git-svn-id: https://svn.fhem.de/fhem/trunk@15465 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 ++ fhem/FHEM/49_SSCam.pm | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index b5d089e22..c4f669fa4 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 49_SSCam: V3.2.4, don't retrieve presets during restart if cam is + disabled - feature: 98_Hyperion: - new "set binary restart/stop" - non-blocking for "get configFiles", "set configFile" and "set binary" diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index 5b4e2f953..13d786c6e 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -27,6 +27,7 @@ ######################################################################################################################### # Versions History: # +# 3.2.4 18.11.2017 fix bug don't retrieve getptzlistpreset if cam is disabled # 3.2.3 08.10.2017 set optimizeParams, get caminfo (simple), minor bugfix, commandref revised # 3.2.2 03.10.2017 make functions ready to use "SYNO.SurveillanceStation.PTZ" version 5, minor fixes, commandref # revised @@ -205,7 +206,7 @@ use Time::HiRes; use HttpUtils; # no if $] >= 5.017011, warnings => 'experimental'; -my $SSCamVersion = "3.2.3"; +my $SSCamVersion = "3.2.4"; # Aufbau Errorcode-Hashes (siehe Surveillance Station Web API) my %SSCam_errauthlist = ( @@ -2207,7 +2208,7 @@ sub getptzlistpreset ($) { my $camname = $hash->{CAMNAME}; my $name = $hash->{NAME}; - return if(IsDisabled($name) || ReadingsVal("$name", "Availability", "enabled") =~ /disabled/); + return if(IsDisabled($name)); if (ReadingsVal("$name", "DeviceType", "") ne "PTZ") { Log3($name, 4, "$name - Retrieval of Presets for $camname can't be executed - $camname is not a PTZ-Camera");