X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=9a633c861064d776de263743058d7c6c481084e7;hb=18a8cd28eab1d63bac7c4e64413dca993e32ccb4;hp=5640843a03daa8e23c827e64868aa0536d406831;hpb=10da8c6ef355d86cb3c0859f264d7d649dce4619;p=dcpomatic.git

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 5640843a0..9a633c861 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -25,19 +25,23 @@
 
 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)
 {
 
 }
 
 Server::~Server ()
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	_terminate = true;
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_terminate = true;
+	}
+
 	_acceptor.close ();
-	_io_service.stop ();
+	stop ();
 }
 
 void
@@ -57,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));
 }
 
@@ -71,3 +75,9 @@ Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code cons
 	handle (socket);
 	start_accept ();
 }
+
+void
+Server::stop ()
+{
+	_io_service.stop ();
+}