diff --git a/CHANGED b/CHANGED index f3b1bfb63..7e3c18975 100644 --- a/CHANGED +++ b/CHANGED @@ -1,5 +1,6 @@ # 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: fix perl warnings, Forum: 45671.msg927912.html#msg927912 - new: 10_WS980: new module to control the WS980Wifi weather station - feature: 93_DbRep: the "explain" SQL-command is possible now in sqlCmd - feature: 10_MYSENSORS_DEVICE: add attrTemplate support diff --git a/FHEM/49_SSCam.pm b/FHEM/49_SSCam.pm index 77371c041..495685d0d 100644 --- a/FHEM/49_SSCam.pm +++ b/FHEM/49_SSCam.pm @@ -48,6 +48,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; # Versions History intern our %SSCam_vNotesIntern = ( + "8.13.2" => "07.04.2019 fix perl warning Forum: https://forum.fhem.de/index.php/topic,45671.msg927912.html#msg927912", "8.13.1" => "06.04.2019 verbose level in X_DelayedShutdown changed ", "8.13.0" => "27.03.2019 add Meta.pm support ", "8.12.0" => "25.03.2019 FHEM standard function X_DelayedShutdown implemented, delay FHEM shutdown as long as sessions ". @@ -1975,13 +1976,14 @@ return; sub SSCam_myVersion($) { my ($hash) = @_; my $name = $hash->{NAME}; - my $actvs = ""; + my $actvs = 0; my @vl = split (/-/,ReadingsVal($name, "SVSversion", ""),2); if(@vl) { $actvs = $vl[0]; $actvs =~ s/\.//g; } + return $actvs; } @@ -6836,7 +6838,7 @@ sub SSCam_ptzpanel($;$$) { # return "" if($actvs <= 71); #} - return if(SSCam_myVersion($hash) <= 71); + return "" if(SSCam_myVersion($hash) <= 71); $ptz_ret = "
"; $ptz_ret.= ''; @@ -7521,12 +7523,13 @@ sub SSCam_composegallery ($;$$) { my $imgdosnap = ""; my $ha = AttrVal($name, "snapGalleryHtmlAttr", AttrVal($name, "htmlattr", 'width="500" height="325"')); - my $pws = AttrVal($strmdev, "popupWindowSize", ""); # Größe eines Popups - $pws =~ s/"//g if($pws); # falls "SSCam_composegallery" durch ein SSCamSTRM-Device aufgerufen wird my $devWlink = ""; + my $pws = ""; if ($strmdev) { + $pws = AttrVal($strmdev, "popupWindowSize", ""); # Größe eines Popups (umgelegt: Forum:https://forum.fhem.de/index.php/topic,45671.msg927912.html#msg927912) + $pws =~ s/"//g if($pws); my $wlha = AttrVal($strmdev, "htmlattr", undef); $ha = (defined($wlha))?$wlha:$ha; # htmlattr vom SSCamSTRM-Device übernehmen falls von SSCamSTRM-Device aufgerufen und gesetzt }