2 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5ca15556b14..3eb47219f30 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * keyboard.c (timer_check_2): Add break so timer_check returns next
+        timeout.
+
 2012-08-06  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Fix Windows build errors introduced after converting to WGET and WSET.
diff --git a/src/keyboard.c b/src/keyboard.c
index 758085d3862..49ea1682400 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4459,6 +4459,7 @@ timer_check_2 (void)
             }
 
           nexttime = make_emacs_time (0, 0);
+          break;
         }
       else
         /* When we encounter a timer that is still waiting,