From 6f568625d715f10c98edd254dd6b050492140287 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 12 Aug 2007 10:45:43 +0200 Subject: [PATCH] Fixed handling kLeft in the calls to cStatus::MsgOsdTextItem() --- CONTRIBUTORS | 1 + HISTORY | 2 ++ menu.c | 8 ++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 52d70b02..5d078cfb 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1796,6 +1796,7 @@ Alexander Rieger for reporting a memory leak in the cTimer::operator=() when using the 'aux' string for fixing cTimer::operator=() in case a cTimer variable is assigned to itself for making the list of tracks given in cStatus::SetAudioTrack() NULL terminated + for fixing handling kLeft in the calls to cStatus::MsgOsdTextItem() Philip Prindeville for updates to 'sources.conf' diff --git a/HISTORY b/HISTORY index a43db5ef..ee085bf0 100644 --- a/HISTORY +++ b/HISTORY @@ -5333,3 +5333,5 @@ Video Disk Recorder Revision History - The list of tracks given in cStatus::SetAudioTrack() is now NULL terminated, so that plugins can actually use all the strings in the list, not just the one pointed to by Index (thanks to Alexander Rieger). +- Fixed handling kLeft in the calls to cStatus::MsgOsdTextItem() (thanks to + Alexander Rieger). diff --git a/menu.c b/menu.c index 5c88b43c..69621efb 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.458 2007/08/12 10:35:16 kls Exp $ + * $Id: menu.c 1.459 2007/08/12 10:44:35 kls Exp $ */ #include "menu.h" @@ -630,7 +630,7 @@ eOSState cMenuText::ProcessKey(eKeys Key) case kRight|k_Repeat: case kRight: DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight); - cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp); + cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft); return osContinue; default: break; } @@ -980,7 +980,7 @@ eOSState cMenuEvent::ProcessKey(eKeys Key) case kRight|k_Repeat: case kRight: DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight); - cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp); + cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft); return osContinue; default: break; } @@ -1809,7 +1809,7 @@ eOSState cMenuRecording::ProcessKey(eKeys Key) case kRight|k_Repeat: case kRight: DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight); - cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp); + cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft); return osContinue; default: break; }