diff --git a/fhem/contrib/DS_Starter/57_SSCal.pm b/fhem/contrib/DS_Starter/57_SSCal.pm index bd1344b1e..a9cf21f41 100644 --- a/fhem/contrib/DS_Starter/57_SSCal.pm +++ b/fhem/contrib/DS_Starter/57_SSCal.pm @@ -1718,11 +1718,7 @@ sub extractEventlist { ## no critic 'complexi } elsif ($p1 eq "UNTIL") { # festes Intervallende angegeben $until = $p2; $until =~ s/[-:]//gx; - (undef,undef,undef,undef,$uets,undef) = explodeDateTime ($hash, $until, 0, 0, 0); - if ($uets < $tstart) { - Log3($name, 4, "$name - Ignore recurring event -> $data->{data}{$key}[$i]{summary} , interval end \"$nedate $netime\" is less than selection start \"$datetimestart\""); - $ignore = 1; - } + $uets = (explodeDateTime ($hash, $until, 0, 0, 0))[4]; } elsif ($p1 eq "BYMONTHDAY") { # Wiederholungseigenschaft -> Tag des Monats z.B. 13 (Tag 13) $bymonthday = $p2; } elsif ($p1 eq "BYDAY") { # Wiederholungseigenschaft -> Wochentag z.B. 2WE,-1SU,4FR (kann auch Liste bei WEEKLY sein) @@ -1730,6 +1726,11 @@ sub extractEventlist { ## no critic 'complexi } } + if (defined $uets && $uets < $tstart) { + Log3($name, 4, "$name - Ignore recurring event -> $data->{data}{$key}[$i]{summary} , interval end \"$nedate $netime\" is less than selection start \"$datetimestart\""); + $ignore = 1; + } + $count = $count ? $count : 9999999; # $count "unendlich" wenn kein COUNT angegeben $interval = $interval ? $interval : 1; $bymonthday = $bymonthday ? $bymonthday : "";