From cd4a7e3ef4bca56685c288492a98659bc893a702 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 4 Jun 2012 09:41:06 +0200 Subject: [PATCH] Fixed the call to ChannelString() in cSkinLCARSDisplayChannel::SetChannel() --- CONTRIBUTORS | 1 + HISTORY | 2 ++ skinlcars.c | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0bacdf8b..c9a5660b 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1141,6 +1141,7 @@ Rolf Ahrenberg to "Single" for fixing reduced bpp support for DVB subtitles for implementing "DVB Standard compliance" handling + for fixing the call to ChannelString() in cSkinLCARSDisplayChannel::SetChannel() Ralf Klueber for reporting a bug in cutting a recording if there is only a single editing mark diff --git a/HISTORY b/HISTORY index 424f9513..edc09622 100644 --- a/HISTORY +++ b/HISTORY @@ -7160,3 +7160,5 @@ Video Disk Recorder Revision History - Fixed making LCARS the default skin. - Adjusted the default values for OSD and font sizes to better fit HDTV. - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). +- Fixed the call to ChannelString() in cSkinLCARSDisplayChannel::SetChannel() (thanks + to Rolf Ahrenberg). diff --git a/skinlcars.c b/skinlcars.c index 49a499b0..68c8df60 100644 --- a/skinlcars.c +++ b/skinlcars.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinlcars.c 2.5 2012/06/04 08:53:57 kls Exp $ + * $Id: skinlcars.c 2.6 2012/06/04 09:35:43 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures, @@ -515,7 +515,7 @@ void cSkinLCARSDisplayChannel::SetChannel(const cChannel *Channel, int Number) else if (Number) ChNumber = cString::sprintf("%d-", Number); else - ChName = ChannelString(NULL, NULL); + ChName = ChannelString(NULL, 0); osd->DrawText(xc00, yc00, ChNumber, Theme.Color(clrChannelFrameFg), frameColor, tallFont, xc02 - xc00, yc02 - yc00, taTop | taRight | taBorder); osd->DrawText(xc03, yc00, ChName, Theme.Color(clrChannelName), Theme.Color(clrBackground), tallFont, xi - xc03 - lineHeight, 0, taTop | taLeft); lastSignalDisplay = 0;