summaryrefslogtreecommitdiff
path: root/osdbase.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-10-02 15:04:34 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2005-10-02 15:04:34 +0200
commit2cc029066b3af90d560ae5d549d0faba76acc77f (patch)
tree2525b228e9b2d6cf23dde0c89de4610c19f14d10 /osdbase.c
parentd808293a06671badd716dd94b93c0aae764a29cb (diff)
downloadvdr-2cc029066b3af90d560ae5d549d0faba76acc77f.tar.gz
vdr-2cc029066b3af90d560ae5d549d0faba76acc77f.tar.bz2
Fixed handling of menus with no selectable items
Diffstat (limited to 'osdbase.c')
-rw-r--r--osdbase.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/osdbase.c b/osdbase.c
index 637543bd..9646bcc4 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osdbase.c 1.21 2005/10/02 09:23:10 kls Exp $
+ * $Id: osdbase.c 1.22 2005/10/02 15:00:40 kls Exp $
*/
#include "osdbase.h"
@@ -213,8 +213,9 @@ void cOsdMenu::Display(void)
int i = first;
int n = 0;
for (cOsdItem *item = Get(first); item; item = Next(item)) {
- displayMenu->SetItem(item->Text(), i - first, i == current, item->Selectable());
- if (i == current)
+ bool CurrentSelectable = (i == current) && item->Selectable();
+ displayMenu->SetItem(item->Text(), i - first, CurrentSelectable, item->Selectable());
+ if (CurrentSelectable)
cStatus::MsgOsdCurrentItem(item->Text());
if (++n == displayMenuItems)
break;