summaryrefslogtreecommitdiffstats
path: root/src/dabOutput
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-11-05 15:00:39 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-11-05 15:00:39 +0100
commit8e609435fc61f543fdc98c78a5fdbeb30af7dadc (patch)
tree98124da31e336be12cabeacd5a07f3bc3303a996 /src/dabOutput
parent5fd4d99aded3677497c6cf5ab31517a5383333cb (diff)
parent5c12d5b387e07203be79df7e4d526d124a53ad8a (diff)
downloaddabmux-8e609435fc61f543fdc98c78a5fdbeb30af7dadc.tar.gz
dabmux-8e609435fc61f543fdc98c78a5fdbeb30af7dadc.tar.bz2
dabmux-8e609435fc61f543fdc98c78a5fdbeb30af7dadc.zip
Merge branch 'next' into inputrework
Diffstat (limited to 'src/dabOutput')
-rw-r--r--src/dabOutput/dabOutputTcp.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dabOutput/dabOutputTcp.cpp b/src/dabOutput/dabOutputTcp.cpp
index 94d379e..975fdff 100644
--- a/src/dabOutput/dabOutputTcp.cpp
+++ b/src/dabOutput/dabOutputTcp.cpp
@@ -133,9 +133,9 @@ class TCPDataDispatcher
while (m_running) {
// Add a new TCPConnection to the list, constructing it from the client socket
- auto optional_sock = m_listener_socket.accept(timeout_ms);
- if (optional_sock) {
- m_connections.emplace(m_connections.begin(), std::move(*optional_sock));
+ auto sock = m_listener_socket.accept(timeout_ms);
+ if (sock.isValid()) {
+ m_connections.emplace(m_connections.begin(), move(sock));
}
}
}