# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1236270899 0
# Node ID b14d67d220333f37ec0f6282cc560b7702484da3
# Parent  5a5d05398f9ec749fb1bd5c02ab108cdf1ffd175
* nsterm.m (ns_select): Shortcircuit if reentrant call.

diff -r 5a5d05398f9e -r b14d67d22033 src/ChangeLog
--- a/src/ChangeLog	Thu Mar 05 12:40:18 2009 +0000
+++ b/src/ChangeLog	Thu Mar 05 16:34:59 2009 +0000
@@ -1,3 +1,7 @@
+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.
diff -r 5a5d05398f9e -r b14d67d22033 src/nsterm.m
--- a/src/nsterm.m	Thu Mar 05 12:40:18 2009 +0000
+++ b/src/nsterm.m	Thu Mar 05 16:34:59 2009 +0000
@@ -3221,7 +3221,7 @@
   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);