FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

57_Calendar: fix count for series with exceptions

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16694 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2018-05-06 10:49:24 +00:00
parent 62951dde4f
commit 5d77585607
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/CHANGED
View File

@ -1,15 +1,16 @@
# 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: fix count for series with exceptions
- bugfix: 72_FB_CALLMONITOR: fix control code entries in phonebook and
reverse search text file
- feature: 49_SSCam: V4.1.0, support Audiostream cams, minor internal changes
- change: 93_Log2Syslog: ssldebug for debugging SSL messages, minor fixes
- feature: 49_SSCam: V3.10.0, CreateStreamDev added, new lastrec_fw_MJPEG,
- feature: 49_SSCam: V3.10.0, CreateStreamDev added, new lastrec_fw_MJPEG,
lastrec_fw_MPEG4/H.264 playback MPEG4/H.264 recordings
- feature: 93_DbRep: V7.17.3, writeToDB - readingname can be replaced by the
value of attribute "readingNameMap"
- change: 88_xs1Bridge: documentation | xs1 with password
- bugfix: 36_Vallox: Fixed Multireadings. Added Legacy Mapping.
- bugfix: 36_Vallox: Fixed Multireadings. Added Legacy Mapping.
added set commands
- bugfix: 00_MQTT: topics and payload patch
- bugfix: 73_GardenaSmartBridge: fix fetch token after rereadcfg
@ -17,7 +18,7 @@
- new: 74_HusqvarnaAutomower.pm: New module to control your
Husqvarna Automower with original Connect Module (SIM)
- bugfix: 73_GardenaSmartBridge: fix delete password then rereadcfg
- bugfix: 93_DbRep: 7.17.2, doesn't writeToDB if device name contain "."
- bugfix: 93_DbRep: 7.17.2, doesn't writeToDB if device name contain "."
- feature: 93_DbLog: addLog - not available reading can be added as new one
(forum:#86966)
- feature: 02_RSS: label and goto in layout definition (forum #86844)

2
fhem/FHEM/57_Calendar.pm
View File

@ -1460,7 +1460,7 @@ sub addOrSkipSeriesEvent($$$$$$) {
#return 0 if($self->addEventLimited($t0, $event) > 0);
}
my $occurances= scalar(@{$self->{events}});
my $occurances= scalar(@{$self->{events}})+scalar(@{$self->{skippedEvents}});
#main::Debug("$occurances occurances so far");
return($occurances< $count);