FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-03 19:49:02 +00:00
Code Issues Releases Wiki Activity

49_SSCam: fix blocking sscam operation if snap was executed with arguments and aatribute snapEmailTxt is not set, (Forum:#45671 #msg885475)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18216 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-01-11 14:20:30 +00:00
parent 112baa73a3
commit 915a51c9d9
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/CHANGED
View File

@ -1,5 +1,8 @@
# 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 blocking sscam operation if snap was executed with
arguments and aatribute snapEmailTxt is not set,
(Forum:#45671 #msg885475)
- feature: 89_FULLY: Non blocking commands, expert mode
- bugfix: 73_AutoShuttersControl: little fixes in commandref
- feature: 49_SSCam: trigger several number of snapshots with alternative

4
fhem/FHEM/49_SSCam.pm
View File

@ -47,6 +47,7 @@ use Encode;
# Versions History intern
our %SSCam_vNotesIntern = (
"8.4.3" => "11.01.2019 fix blocking Active-Token if snap was done with arguments and snapEmailTxt not set, Forum:#45671 #msg885475 ",
"8.4.2" => "10.01.2019 snapEmailTxt can use placeholders \$DATE, \$TIME ",
"8.4.1" => "09.01.2019 Transaction of snap and getsnapinfo implemented, debugactive token verbose level changed ",
"8.4.0" => "07.01.2019 command snap extended to \"snap [number] [lag] [snapEmailTxt:\"subject => <Betreff-Text>, body => ".
@ -4933,6 +4934,9 @@ sub SSCam_camop_parse ($) {
my $emtxt = $hash->{HELPER}{SMTPMSG}?$hash->{HELPER}{SMTPMSG}:""; # alternativer Text für Email-Versand
if($ncount > 0) {
InternalTimer(gettimeofday()+$lag, "SSCam_camsnap", "$name:$num:$lag:$ncount:$emtxt:$tac", 0);
if(!$tac) {
SSCam_delActiveToken($hash); # Token freigeben wenn keine Transaktion läuft
}
return;
}

6
fhem/contrib/DS_Starter/49_SSCam.pm
View File

@ -1,5 +1,5 @@
########################################################################################################################
# $Id: 49_SSCam.pm 18122 2019-01-02 21:56:15Z DS_Starter $
# $Id: 49_SSCam.pm 18207 2019-01-10 19:00:15Z DS_Starter $
#########################################################################################################################
# 49_SSCam.pm
#
@ -47,6 +47,7 @@ use Encode;
# Versions History intern
our %SSCam_vNotesIntern = (
"8.4.3" => "11.01.2019 fix blocking Active-Token if snap was done with arguments and snapEmailTxt not set, Forum:#45671 #msg885475 ",
"8.4.2" => "10.01.2019 snapEmailTxt can use placeholders \$DATE, \$TIME ",
"8.4.1" => "09.01.2019 Transaction of snap and getsnapinfo implemented, debugactive token verbose level changed ",
"8.4.0" => "07.01.2019 command snap extended to \"snap [number] [lag] [snapEmailTxt:\"subject => <Betreff-Text>, body => ".
@ -4933,6 +4934,9 @@ sub SSCam_camop_parse ($) {
my $emtxt = $hash->{HELPER}{SMTPMSG}?$hash->{HELPER}{SMTPMSG}:""; # alternativer Text für Email-Versand
if($ncount > 0) {
InternalTimer(gettimeofday()+$lag, "SSCam_camsnap", "$name:$num:$lag:$ncount:$emtxt:$tac", 0);
if(!$tac) {
SSCam_delActiveToken($hash); # Token freigeben wenn keine Transaktion läuft
}
return;
}