diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2005-09-03 09:09:23 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2005-09-03 09:09:23 +0200 |
| commit | 2a91de02abee737333cf650b32d13e5689443b76 (patch) | |
| tree | 6823ef6668298cb01660edc95eba866f459c9db9 | |
| parent | 70bc836e3ff32ef8e22d6dffb2d7b2ac71ed746a (diff) | |
| download | vdr-2a91de02abee737333cf650b32d13e5689443b76.tar.gz vdr-2a91de02abee737333cf650b32d13e5689443b76.tar.bz2 | |
Repeat keys are now ignored when waiting for a keypress to cancel an operation
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | interface.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 984b7cb2..bfbc863a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1465,3 +1465,6 @@ Hardy Flor <HFlor@web.de> Harald Milz <hm@seneca.muc.de> for his CUTR patch, which was used as a base to implement the SVDRP command EDIT + +Marko Mäkelä <marko.makela@hut.fi> + for making repeat keys be ignored when waiting for a keypress to cancel an operation @@ -3747,7 +3747,7 @@ Video Disk Recorder Revision History - The new SVDRP command EDIT can be used to start the editing process of a recording (based on the CUTR patch by Harald Milz). -2005-09-02: Version 1.3.32 +2005-09-03: Version 1.3.32 - Added some missing braces in remux.c (thanks to Wayne Keer for reporting this one). - Removed unused MAINMENUENTRY from svdrpdemo.c (thanks to Udo Richter for reporting @@ -3771,3 +3771,5 @@ Video Disk Recorder Revision History by Malcolm Caldwell). - Adjusted the Makefile to the dvb-kernel driver on kernel 2.6 and up (thanks to Lauri Tischler). +- Repeat keys are now ignored when waiting for a keypress to cancel an operation + (thanks to Marko Mäkelä). diff --git a/interface.c b/interface.c index 33737433..4f18ddda 100644 --- a/interface.c +++ b/interface.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: interface.c 1.68 2004/11/01 14:23:28 kls Exp $ + * $Id: interface.c 1.69 2005/09/03 09:07:23 kls Exp $ */ #include "interface.h" @@ -56,7 +56,7 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar) time_t timeout = time(NULL) + Seconds; for (;;) { Key = GetKey(); - if ((Key != kNone && (RAWKEY(Key) != kOk || RAWKEY(Key) == Key)) || time(NULL) > timeout || interrupted) + if (ISRAWKEY(Key) || time(NULL) > timeout || interrupted) break; } if (KeepChar && ISRAWKEY(Key)) |