Merge from origin/emacs-25

06cb28f Fix bug#23462: Crash when iconifying frame on OS X.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/nsterm.m b/src/nsterm.m
index d79e4f4017c..f2b0d901770 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1612,7 +1612,12 @@ x_iconify_frame (struct frame *f)
       [[view window] orderOut: NSApp];
       [[view window] setFrame: t display: NO];
     }
+
+  /* Processing input while Emacs is being minimized can cause a
+     crash, so block it for the duration. */
+  block_input();
   [[view window] miniaturize: NSApp];
+  unblock_input();
 }
 
 /* Free X resources of frame F.  */