Merge next into servicelinking

1 files changed, 8 insertions, 1 deletions

diff --git a/src/dabOutput/dabOutputTcp.cpp b/src/dabOutput/dabOutputTcp.cpp
index 2c5a067..8696bec 100644
--- a/src/dabOutput/dabOutputTcp.cpp
+++ b/src/dabOutput/dabOutputTcp.cpp
@@ -128,9 +128,14 @@ class TCPDataDispatcher
         void process(long) {
             m_listener_socket.listen();
 
+            const int timeout_ms = 1000;
+
             while (m_running) {
                 // Add a new TCPConnection to the list, constructing it from the client socket
-                m_connections.emplace(m_connections.begin(), m_listener_socket.accept());
+                auto optional_sock = m_listener_socket.accept(timeout_ms);
+                if (optional_sock) {
+                    m_connections.emplace(m_connections.begin(), std::move(*optional_sock));
+                }
             }
         }
 
@@ -191,6 +196,8 @@ int DabOutputTcp::Open(const char* name)
     string address;
     bool success = parse_uri(name, &port, address);
 
+    uri_ = name;
+
     if (success) {
         dispatcher_ = new TCPDataDispatcher();
         try {