From aebc766ee72b65a3cb5438404d236ab5afe4c472 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 27 Jan 2006 14:11:25 +0100 Subject: Fixed a crash when pressing '0' in the "Schedule" menu on a channel that doesn't have any EPG data --- CONTRIBUTORS | 4 ++++ HISTORY | 2 ++ menu.c | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c52781d9..0b4dc12a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1684,3 +1684,7 @@ Markus Hahn Jaroslaw Swierczynski for updating the Polish OSD texts and the fontosd-iso8859-2.c file + +Alexander Hans + fpr reporting a crash when pressing '0' in the "Schedule" menu on a channel that + doesn't have any EPG data diff --git a/HISTORY b/HISTORY index 0a2cdc06..458f05af 100644 --- a/HISTORY +++ b/HISTORY @@ -4234,3 +4234,5 @@ Video Disk Recorder Revision History "No Title" if none was set. - Fixed checking toFile in cCuttingThread::Action() (found in a larger patch from Artur Skawina). +- Fixed a crash when pressing '0' in the "Schedule" menu on a channel that doesn't + have any EPG data (reported ny Alexander Hans). diff --git a/menu.c b/menu.c index ec49b1ce..bdd4aeb4 100644 --- a/menu.c +++ b/menu.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.403 2006/01/22 16:06:39 kls Exp $ + * $Id: menu.c 1.404 2006/01/27 14:04:34 kls Exp $ */ #include "menu.h" @@ -1352,6 +1352,8 @@ eOSState cMenuSchedule::Number(void) Event = CurrentItem->event; Channel = Channels.GetByChannelID(Event->ChannelID(), true); } + else + Channel = Channels.GetByNumber(cDevice::CurrentChannel()); switch (cMenuScheduleItem::SortMode()) { case cMenuScheduleItem::ssmAllThis: PrepareScheduleAllThis(Event, Channel); break; case cMenuScheduleItem::ssmThisThis: PrepareScheduleThisThis(Event, Channel); break; -- cgit v1.2.3