aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Third2017-01-14 16:57:46 +0000
committerAlan Third2017-01-14 17:00:03 +0000
commitaf3db69ee640d9a1e9027c04ba3b5bec7c2681ab (patch)
treee7b6d3bbeeb698e26897b592f7e3d58d14073da6
parenta23974d6e62f660259409baadd848cf6f834d88b (diff)
downloademacs-af3db69ee640d9a1e9027c04ba3b5bec7c2681ab.tar.gz
emacs-af3db69ee640d9a1e9027c04ba3b5bec7c2681ab.zip
Fix NS main thread check (bug#25265)
* src/nsterm.m (ns_read_socket, ns_select): Replace mainThread with isMainThread.
-rw-r--r--src/nsterm.m4
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)
4039 return i; 4039 return i;
4040 } 4040 }
4041 4041
4042 if ([NSThread mainThread]) 4042 if ([NSThread isMainThread])
4043 { 4043 {
4044 block_input (); 4044 block_input ();
4045 n_emacs_events_pending = 0; 4045 n_emacs_events_pending = 0;
@@ -4123,7 +4123,7 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
4123 } 4123 }
4124 4124
4125 if (NSApp == nil 4125 if (NSApp == nil
4126 || ![NSThread mainThread] 4126 || ![NSThread isMainThread]
4127 || (timeout && timeout->tv_sec == 0 && timeout->tv_nsec == 0)) 4127 || (timeout && timeout->tv_sec == 0 && timeout->tv_nsec == 0))
4128 return pselect (nfds, readfds, writefds, exceptfds, timeout, sigmask); 4128 return pselect (nfds, readfds, writefds, exceptfds, timeout, sigmask);
4129 4129