summaryrefslogtreecommitdiff
path: root/src/remote.cc
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2018-11-26 12:47:44 +1100
committerMaxime Coste <mawww@kakoune.org>2018-11-26 12:48:48 +1100
commit6c54c4740d2144e897cad5b033ab160b3ab2ddff (patch)
treed0ca191352a074d0e408958c69d965155224d31d /src/remote.cc
parent31d3cef0933f81795afa8eaad76b34c206b4d056 (diff)
Read initial remote message in Urgent EventMode
Fixes #2497
Diffstat (limited to 'src/remote.cc')
-rw-r--r--src/remote.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/remote.cc b/src/remote.cc
index 8022174f..fd76e94c 100644
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -699,13 +699,12 @@ public:
Accepter(int socket)
: m_socket_watcher(socket, FdEvents::Read,
[this](FDWatcher&, FdEvents, EventMode mode) {
- if (mode == EventMode::Normal)
- handle_available_input();
+ handle_available_input(mode);
})
{}
private:
- void handle_available_input()
+ void handle_available_input(EventMode mode)
{
const int sock = m_socket_watcher.fd();
try
@@ -713,7 +712,7 @@ private:
while (not m_reader.ready() and fd_readable(sock))
m_reader.read_available(sock);
- if (not m_reader.ready())
+ if (mode != EventMode::Normal or not m_reader.ready())
return;
switch (m_reader.type())