2 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 43e56416e57..9cf5eb591bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-24  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (drawRect:): Add block/unblock_input (Bug#19660).
+
 2015-01-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix coding.c subscript error
diff --git a/src/nsterm.m b/src/nsterm.m
index 24770f6dd10..08b8e3a9076 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6750,7 +6750,9 @@ if (cols > 0 && rows > 0)
     return;
 
   ns_clear_frame_area (emacsframe, x, y, width, height);
+  block_input ();
   expose_frame (emacsframe, x, y, width, height);
+  unblock_input ();
 
   /*
     drawRect: may be called (at least in OS X 10.5) for invisible