2 files changed, 6 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index bf1e9347..5b13bf14 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2941,3 +2941,5 @@ Video Disk Recorder Revision History
 - Removed all error messages from cRecordings::ScanVideoDir() and just skipping
   entries that cause errors in order to avoid failure in case of things like
   broken links etc.
+- The function cTimers::SetEvents() now immediately returns if there is some user
+  input.
diff --git a/timers.c b/timers.c
index 69693650..ab1690a6 100644
--- a/timers.c
+++ b/timers.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.12 2004/03/14 13:27:57 kls Exp $
+ * $Id: timers.c 1.13 2004/07/17 12:46:27 kls Exp $
  */
 
 #include "timers.h"
 #include <ctype.h>
 #include "channels.h"
 #include "i18n.h"
+#include "remote.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
@@ -516,6 +517,8 @@ void cTimers::SetEvents(void)
             //XXX what if the Schedule doesn't have any VPS???
             int Match = tmNone;
             for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
+                if (cRemote::HasKeys())
+                   return; // react immediately on user input
                 int m = ti->Matches(e);
                 if (m > Match) {
                    Match = m;