X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=9a633c861064d776de263743058d7c6c481084e7;hb=a1f7bf2d9e5610075fbd898cdf52f4f8373741f2;hp=722b1c81130bde8a81856526c3ad01c357153f3e;hpb=8b183eea3238cc2f25cf62e63d724a2d2d361ee7;p=dcpomatic.git

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 722b1c811..9a633c861 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -25,9 +25,10 @@
 
 using boost::shared_ptr;
 
-Server::Server (int port)
+Server::Server (int port, int timeout)
 	: _terminate (false)
 	, _acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port))
+	, _timeout (timeout)
 {
 
 }
@@ -60,7 +61,7 @@ Server::start_accept ()
 		}
 	}
 
-	shared_ptr<Socket> socket (new Socket);
+	shared_ptr<Socket> socket (new Socket(_timeout));
 	_acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error));
 }