summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-05-11 21:09:48 +0000
committerDavid Robillard <d@drobilla.net>2015-05-11 21:09:48 +0000
commit2f7026265f4e7888dcd731f84213f78da07e78b2 (patch)
treece82df291d8cbd5df2f4ef34aeed364d75f32c78 /src/server
parentfd83a88db429aa26e6457d1fb437a21c76f01bc7 (diff)
downloadingen-2f7026265f4e7888dcd731f84213f78da07e78b2.tar.gz
ingen-2f7026265f4e7888dcd731f84213f78da07e78b2.tar.bz2
ingen-2f7026265f4e7888dcd731f84213f78da07e78b2.zip
Fix handling of spurious polls.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5676 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server')
-rw-r--r--src/server/SocketListener.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/SocketListener.cpp b/src/server/SocketListener.cpp
index d09771a4..8eca2d60 100644
--- a/src/server/SocketListener.cpp
+++ b/src/server/SocketListener.cpp
@@ -89,11 +89,11 @@ SocketListener::ingen_listen(Engine* engine,
if (ret == -1) {
world->log().error(fmt("Poll error: %1%\n") % strerror(errno));
break;
- } else if ((pfds[0].revents & POLLHUP) || pfds[1].revents & POLLHUP) {
- break;
} else if (ret == 0) {
- world->log().error("Poll returned with no data\n");
+ world->log().warn("Poll returned with no data\n");
continue;
+ } else if ((pfds[0].revents & POLLHUP) || pfds[1].revents & POLLHUP) {
+ break;
}
if (pfds[0].revents & POLLIN) {