summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY3
-rw-r--r--epg.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 4e05870d..f9288897 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9663,8 +9663,9 @@ Video Disk Recorder Revision History
- EXPIRELATENCY now only applies to VPS timers.
- Deleting expired timers is now triggered immediately after the timers are modified.
-2021-04-28:
+2021-04-29:
- Now using a separate fixed value for internal EPG linger time. This fixes problems with
spawned timers jumping to the next event in case Setup.EPGLinger is very small. (reported
by Jürgen Schneider).
+- Fixed a possible crash in the Schedule menu, in case Setup.EPGLinger is 0.
diff --git a/epg.c b/epg.c
index 7178d740..d917e669 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
*
- * $Id: epg.c 5.5 2021/04/28 20:44:56 kls Exp $
+ * $Id: epg.c 5.6 2021/04/29 09:19:58 kls Exp $
*/
#include "epg.h"
@@ -1385,6 +1385,8 @@ const cSchedule *cSchedules::GetSchedule(const cChannel *Channel, bool AddIfMiss
{
// This is not very beautiful, but it dramatically speeds up the
// "What's on now/next?" menus.
+ if (!Channel)
+ return NULL;
static cSchedule DummySchedule(tChannelID::InvalidID);
if (!Channel->schedule)
Channel->schedule = GetSchedule(Channel->GetChannelID());