From 029ea74fe30ab840e37b5dc1a9db470719fcf953 Mon Sep 17 00:00:00 2001 From: borisneubert <> Date: Thu, 2 Oct 2014 18:05:46 +0000 Subject: [PATCH] 57_Calendar: calendar event anymore in modeAlarmed if started git-svn-id: https://svn.fhem.de/fhem/trunk@6655 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/57_Calendar.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 1b09d2884..201b1996a 100644 --- a/fhem/CHANGED +++ b/fhem/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: 57_Calendar: calendar event anymore in modeAlarmed if started - feature: 57_Calendar: deal with non-existent end times - bugfix: SOMFY: fix non-working on/off-for-timer methods made positioning attributes optional diff --git a/fhem/FHEM/57_Calendar.pm b/fhem/FHEM/57_Calendar.pm index f999e7677..92890e5c2 100644 --- a/fhem/FHEM/57_Calendar.pm +++ b/fhem/FHEM/57_Calendar.pm @@ -615,7 +615,7 @@ sub isAlarmed { my ($self,$t) = @_; return 0 if($self->isDeleted()); return $self->{alarm} ? - (($self->{alarm}<= $t && $t<= $self->{start}) ? 1 : 0) : 0; + (($self->{alarm}<= $t && $t< $self->{start}) ? 1 : 0) : 0; } # return 1 if time is between start time and end time, else 0