diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | vdr.c | 8 |
2 files changed, 6 insertions, 3 deletions
@@ -2094,3 +2094,4 @@ Video Disk Recorder Revision History to Oliver Endriss for reporting this one). - Fixed double call to MainMenuAction() of a plugin if invoked via a hotkey (thanks to Kai Moeller for reporting this one). +- Fixed handling dedicated keys. @@ -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: |