2 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1e9e65192f7..700ff294c83 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (ns_read_socket): Return early if there is a modal
+        window (Bug#12043).
+
 2012-07-25  Martin Rudalics  <rudalics@gmx.at>
 
         * frame.c (Fredirect_frame_focus): In doc-string don't mention
diff --git a/src/nsterm.m b/src/nsterm.m
index e018ea34910..1f06d49c5b9 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3411,6 +3411,9 @@ ns_read_socket (struct terminal *terminal, int expected,
 
 /* NSTRACE (ns_read_socket); */
 
+  if ([NSApp modalWindow] != nil)
+    return -1;
+
   if (interrupt_input_blocked)
     {
       interrupt_input_pending = 1;