From ccbc445286a25d5ce88faf1d6a273abc0382aaf3 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Thu, 5 Mar 2009 16:34:59 +0000 Subject: [PATCH] * nsterm.m (ns_select): Shortcircuit if reentrant call. --- src/ChangeLog | 4 ++++ src/nsterm.m | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index ae3ef0e0537..876b8887876 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-03-05 Adrian Robert + + * nsterm.m (ns_select): Shortcircuit if reentrant call. + 2009-03-05 Kenichi Handa * font.c (font_select_entity): New function. diff --git a/src/nsterm.m b/src/nsterm.m index 3e9fb0b2a3a..d34641f6be0 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3221,7 +3221,7 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds, 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); -- 2.39.5