]> code.delx.au - gnu-emacs/commitdiff
Fix bug#23462: Crash when iconifying frame on OS X.
authorAlan Third <alan@idiocy.org>
Mon, 16 May 2016 18:37:23 +0000 (20:37 +0200)
committerAnders Lindgren <andlind@gmail.com>
Mon, 16 May 2016 18:37:23 +0000 (20:37 +0200)
* src/nsterm.m (x_iconify_frame): Block input while miniaturize is
running.

src/nsterm.m

index 34c5395b630d5a6f3f9650354b1530e7ce22d0da..e6a10b89f81a3295f55d1c1ab15f789e76663785 100644 (file)
@@ -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.  */