X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=722b1c81130bde8a81856526c3ad01c357153f3e;hb=14cccb179fff7bbbf422e13f9d2e3264239c93c7;hp=f137d07f83639057181e3aa295fa0c3391eea871;hpb=6fa353595ce8f784b7d5004a6c38c78bddae94c7;p=dcpomatic.git

diff --git a/src/lib/server.cc b/src/lib/server.cc
index f137d07f8..722b1c811 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -33,9 +34,13 @@ Server::Server (int port)
 
 Server::~Server ()
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	_terminate = true;
-	_io_service.stop ();
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_terminate = true;
+	}
+
+	_acceptor.close ();
+	stop ();
 }
 
 void
@@ -69,3 +74,9 @@ Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code cons
 	handle (socket);
 	start_accept ();
 }
+
+void
+Server::stop ()
+{
+	_io_service.stop ();
+}