summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-01-05 15:35:06 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2006-01-05 15:35:06 +0100
commitc0f1fc817ea9e3bbe64b4a9ebbff5ba13c0dd3c9 (patch)
tree2eb5b0de091be2fc672bebd4cec1dc9890f90f48 /vdr.c
parent526c94f017e2f484abf447d59b8fd2f2c3ab3c00 (diff)
downloadvdr-c0f1fc817ea9e3bbe64b4a9ebbff5ba13c0dd3c9.tar.gz
vdr-c0f1fc817ea9e3bbe64b4a9ebbff5ba13c0dd3c9.tar.bz2
The default cOsdObject::Show() now automatically calls cOsdMenu::Display() if this is a menu
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/vdr.c b/vdr.c
index 8f63f006..96e775a2 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.228 2006/01/05 13:54:04 kls Exp $
+ * $Id: vdr.c 1.229 2006/01/05 15:35:06 kls Exp $
*/
#include <getopt.h>
@@ -812,11 +812,8 @@ int main(int argc, char *argv[])
cPlugin *plugin = cPluginManager::GetPlugin(cRemote::GetPlugin());
if (plugin) {
Menu = plugin->MainMenuAction();
- if (Menu) {
+ if (Menu)
Menu->Show();
- if (Menu->IsMenu())
- ((cOsdMenu*)Menu)->Display();
- }
}
else
esyslog("ERROR: unknown plugin '%s'", cRemote::GetPlugin());