summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2003-05-02 10:59:07 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2003-05-02 10:59:07 +0200
commit6ffb7912d8f83bf0142c9182957a5ff382c72f2e (patch)
treefb925c258e8d1da2aa467974c7c7fb36828da9d8 /vdr.c
parent03a4a3a6182ca2b34163ba8b3de7728d0aca0b7a (diff)
downloadvdr-6ffb7912d8f83bf0142c9182957a5ff382c72f2e.tar.gz
vdr-6ffb7912d8f83bf0142c9182957a5ff382c72f2e.tar.bz2
Fixed handling dedicated keys
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/vdr.c b/vdr.c
index a160e4cf..ca16433e 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/people/kls/vdr
*
- * $Id: vdr.c 1.150 2003/04/21 14:41:41 kls Exp $
+ * $Id: vdr.c 1.151 2003/05/02 10:59:07 kls Exp $
*/
#include <getopt.h>
@@ -503,6 +503,7 @@ int main(int argc, char *argv[])
switch (key) {
// Menu control:
case kMenu:
+ key = kNone; // nobody else needs to see this key
if (Menu) {
DELETENULL(Menu);
if (!Temp)
@@ -518,14 +519,15 @@ int main(int argc, char *argv[])
if (cControl::Control())\
cControl::Control()->Hide();\
Menu = new cMenuMain(cControl::Control(), function);\
- Temp = NULL;
+ Temp = NULL;\
+ key = kNone; // nobody else needs to see this key
case kSchedule: DirectMainFunction(osSchedule); break;
case kChannels: DirectMainFunction(osChannels); break;
case kTimers: DirectMainFunction(osTimers); break;
case kRecordings: DirectMainFunction(osRecordings); break;
case kSetup: DirectMainFunction(osSetup); break;
case kCommands: DirectMainFunction(osCommands); break;
- case kUser1 ... kUser9: cRemote::PutMacro(key); break;
+ case kUser1 ... kUser9: cRemote::PutMacro(key); key = kNone; break;
case k_Plugin: DirectMainFunction(osPlugin, cRemote::GetPlugin()); break;
// Channel up/down:
case kChanUp|k_Repeat: