Various bits of server tidying up.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/lib/server.cc b/src/lib/server.cc
index bad7ad893..2930e3c4b 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -209,7 +209,7 @@ Server::run (int num_threads)
 {
 	_log->log (String::compose ("Server starting with %1 threads", num_threads));
 	if (_verbose) {
-		cout << "DCP-o-matic server started with " << num_threads << " threads.\n";
+		cout << "DCP-o-matic server starting with " << num_threads << " threads.\n";
 	}
 	
 	for (int i = 0; i < num_threads; ++i) {
@@ -243,6 +243,7 @@ Server::run (int num_threads)
 
 void
 Server::broadcast_thread ()
+try
 {
 	boost::asio::io_service io_service;
 
@@ -261,6 +262,10 @@ Server::broadcast_thread ()
 
 	io_service.run ();
 }
+catch (...)
+{
+	store_current ();
+}
 
 void
 Server::broadcast_received ()