summaryrefslogtreecommitdiff
path: root/osd.c
diff options
context:
space:
mode:
Diffstat (limited to 'osd.c')
-rw-r--r--osd.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/osd.c b/osd.c
index 0b445780..56ba9b5c 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.c 1.22 2002/03/24 11:23:23 kls Exp $
+ * $Id: osd.c 1.23 2002/03/29 16:34:03 kls Exp $
*/
#include "osd.h"
@@ -76,6 +76,7 @@ eOSState cOsdItem::ProcessKey(eKeys Key)
cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
{
+ digit = 0;
hasHotkeys = false;
visible = false;
title = NULL;
@@ -105,12 +106,15 @@ cOsdMenu::~cOsdMenu()
const char *cOsdMenu::hk(const char *s)
{
static char buffer[32];
- if (digit < 9) {
- snprintf(buffer, sizeof(buffer), " %d %s", ++digit, s);
- return buffer;
+ if (s && hasHotkeys) {
+ if (digit == 0 && '1' <= *s && *s <= '9' && *(s + 1) == ' ')
+ digit = 10; // prevents automatic hotkeys - input already has them
+ if (digit < 9) {
+ snprintf(buffer, sizeof(buffer), " %d %s", ++digit, s);
+ s = buffer;
+ }
}
- else
- return s;
+ return s;
}
void cOsdMenu::SetHasHotkeys(void)