* keyboard.c (input_available_signal): Call SIGNAL_THREAD_CHECK

before touching input_available_clear_time, to avoid accessing it
from multiple threads.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5030c115d35f026aa5b11898c1049e59687be7a9..83419a166a90ea9cd46d68dd6c8b66af9bbd5cbd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-23  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * keyboard.c (input_available_signal): Call SIGNAL_THREAD_CHECK
+       before touching input_available_clear_time, to avoid accessing it
+       from multiple threads.
+
 2004-12-23  Jason Rumney  <jasonr@gnu.org>
 
        * image.c (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour

diff --git a/src/keyboard.c b/src/keyboard.c
index f5ca087227d5925ffc16ee3f8d7b3592ffdbb2f7..1c6f3f7c5f5ffe7e07cf7b56bf633dddfd2da43a 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6841,14 +6841,16 @@ input_available_signal (signo)
   sigisheld (SIGIO);
 #endif
 
-  if (input_available_clear_time)
-    EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0);
-
 #ifdef SYNC_INPUT
   interrupt_input_pending = 1;
 #else
-
   SIGNAL_THREAD_CHECK (signo);
+#endif
+  
+  if (input_available_clear_time)
+    EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0);
+
+#ifndef SYNC_INPUT
   handle_async_input ();
 #endif