summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY2
-rw-r--r--menu.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index da92260d..7448910d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4100,3 +4100,5 @@ Video Disk Recorder Revision History
- In the "Channels" menu the numeric keys now position the cursor to the channel
with the given number (see MANUAL, section "Remote Control Keys", note (3) for
details).
+- The "Mark/Move" function in the "Channels" menu now also works in the non-numeric
+ sort modes.
diff --git a/menu.c b/menu.c
index 5fc1323d..9548ba4e 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.385 2006/01/05 13:26:37 kls Exp $
+ * $Id: menu.c 1.386 2006/01/05 14:02:45 kls Exp $
*/
#include "menu.h"
@@ -434,7 +434,7 @@ void cMenuChannels::Setup(void)
if (cMenuChannelItem::SortMode() != cMenuChannelItem::csmNumber)
Sort();
SetCurrent(currentItem);
- SetHelp(tr("Edit"), tr("New"), tr("Delete"), cMenuChannelItem::SortMode() == cMenuChannelItem::csmNumber ? tr("Mark") : NULL);
+ SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
Display();
}
@@ -567,7 +567,7 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
case kRed: return Edit();
case kGreen: return New();
case kYellow: return Delete();
- case kBlue: if (!HasSubMenu() && cMenuChannelItem::SortMode() == cMenuChannelItem::csmNumber)
+ case kBlue: if (!HasSubMenu())
Mark();
break;
default: break;