procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent NS event loop being re-entered (bug#11049)

Browse source 
* nsterm.m (ns_read_socket, ns_select): Return -1 if already in event
loop instead of aborting.
This commit is contained in:
Alan Third 2016-06-26 00:10:50 +01:00
parent 5508f06f32
commit ee7bc98860
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nsterm.m
View file

@ -4098,6 +4098,9 @@ in certain situations (rapid incoming events).
NSTRACE_WHEN (NSTRACE_GROUP_EVENTS, "ns_read_socket");
if (apploopnr > 0)
return -1; /* Already within event loop. */
#ifdef HAVE_NATIVE_FS
check_native_fs ();
#endif
@ -4182,6 +4185,9 @@ in certain situations (rapid incoming events).
NSTRACE_WHEN (NSTRACE_GROUP_EVENTS, "ns_select");
if (apploopnr > 0)
return -1; /* Already within event loop. */
#ifdef HAVE_NATIVE_FS
check_native_fs ();
#endif