* nsterm.m (ns_select): Shortcircuit if reentrant call.

ccbc4452 · Adrian Robert · 69a8e484 · ccbc4452 · ccbc4452
Commit ccbc4452 authored Mar 05, 2009 by Adrian Robert
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

src/ChangeLog src/ChangeLog +4 -0

src/nsterm.m src/nsterm.m +1 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2009-03-05  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+	* nsterm.m (ns_select): Shortcircuit if reentrant call.
+
 2009-03-05  Kenichi Handa  <handa@m17n.org>
  
 	* font.c (font_select_entity): New function.

--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3221,7 +3221,7 @@ overwriting cursor (usually when cursor on a tab) */
  NSEvent *ev;
 /*  NSTRACE (ns_select); */

-  if (NSApp == nil /* || ([NSApp isActive] == NO &&
+  if (NSApp == nil || inNsSelect == 1 /* || ([NSApp isActive] == NO &&
                      [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil
 inMode:NSDefaultRunLoopMode dequeue:NO] == nil) */)
    return select (nfds, readfds, writefds, exceptfds, timeout);