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

95_holiday.pm: fix no state setting when holiday_refresh called before InternalTimer (forum #72122)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14346 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-05-22 10:22:55 +00:00
parent 25ec2beed5
commit 5e8e1c71b4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/95_holiday.pm
View File

@ -45,7 +45,7 @@ holiday_refresh($;$)
{ {
my ($name, $fordate) = (@_); my ($name, $fordate) = (@_);
my $hash = $defs{$name}; my $hash = $defs{$name};
my $internal; my $fromTimer=0;
return if(!$hash); # Just deleted return if(!$hash); # Just deleted
@ -53,7 +53,7 @@ holiday_refresh($;$)
my @lt = localtime($nt); my @lt = localtime($nt);
my @fd; my @fd;
if(!$fordate) { if(!$fordate) {
$internal = 1; $fromTimer = 1;
$fordate = sprintf("%02d-%02d", $lt[4]+1, $lt[3]); $fordate = sprintf("%02d-%02d", $lt[4]+1, $lt[3]);
@fd = @lt; @fd = @lt;
} else { } else {
@ -61,7 +61,7 @@ holiday_refresh($;$)
@fd = localtime(mktime(1,1,1,$d,$m-1,$lt[5],0,0,-1)); @fd = localtime(mktime(1,1,1,$d,$m-1,$lt[5],0,0,-1));
} }
Log3 $name, 5, "holiday_refresh $name called for $fordate"; Log3 $name, 5, "holiday_refresh $name called for $fordate ($fromTimer)";
my $fname = $attr{global}{modpath} . "/FHEM/" . $hash->{NAME} . ".holiday"; my $fname = $attr{global}{modpath} . "/FHEM/" . $hash->{NAME} . ".holiday";
my ($err, @holidayfile) = FileRead($fname); my ($err, @holidayfile) = FileRead($fname);
@ -178,13 +178,13 @@ holiday_refresh($;$)
push @foundList, "none" if(!int(@foundList)); push @foundList, "none" if(!int(@foundList));
my $found = join(", ", @foundList); my $found = join(", ", @foundList);
if($fromTimer) {
RemoveInternalTimer($name); RemoveInternalTimer($name);
$nt -= ($lt[2]*3600+$lt[1]*60+$lt[0]); # Midnight $nt -= ($lt[2]*3600+$lt[1]*60+$lt[0]); # Midnight
$nt += 86400 + 2; # Tomorrow $nt += 86400 + 2; # Tomorrow
$hash->{TRIGGERTIME} = $nt; $hash->{TRIGGERTIME} = $nt;
InternalTimer($nt, "holiday_refresh", $name, 0); InternalTimer($nt, "holiday_refresh", $name, 0);
if($internal) {
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate($hash, 'state', $found); readingsBulkUpdate($hash, 'state', $found);
readingsBulkUpdate($hash, 'yesterday', CommandGet(undef,"$name yesterday")); readingsBulkUpdate($hash, 'yesterday', CommandGet(undef,"$name yesterday"));