diff options
| author | Alan Third <alan@idiocy.org> | 2017-01-14 16:57:46 +0000 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2017-01-14 17:00:03 +0000 |
| commit | af3db69ee640d9a1e9027c04ba3b5bec7c2681ab (patch) | |
| tree | e7b6d3bbeeb698e26897b592f7e3d58d14073da6 /src | |
| parent | a23974d6e62f660259409baadd848cf6f834d88b (diff) | |
| download | emacs-af3db69ee640d9a1e9027c04ba3b5bec7c2681ab.tar.gz | |
Fix NS main thread check (bug#25265)
* src/nsterm.m (ns_read_socket, ns_select): Replace mainThread with
isMainThread.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 90664f652ff..63f1b15b24e 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -4039,7 +4039,7 @@ ns_read_socket (struct terminal *terminal, struct input_event *hold_quit) return i; } - if ([NSThread mainThread]) + if ([NSThread isMainThread]) { block_input (); n_emacs_events_pending = 0; @@ -4123,7 +4123,7 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds, } if (NSApp == nil - || ![NSThread mainThread] + || ![NSThread isMainThread] || (timeout && timeout->tv_sec == 0 && timeout->tv_nsec == 0)) return pselect (nfds, readfds, writefds, exceptfds, timeout, sigmask); |