Merge 1.0

1 files changed, 10 insertions, 0 deletions

diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index de90e0d5c..5b67d8048 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -47,6 +47,7 @@ ServerFinder::ServerFinder ()
 
 void
 ServerFinder::broadcast_thread ()
+try
 {
 	boost::system::error_code error;
 	boost::asio::io_service io_service;
@@ -88,9 +89,14 @@ ServerFinder::broadcast_thread ()
 		dcpomatic_sleep (10);
 	}
 }
+catch (...)
+{
+	store_current ();
+}
 
 void
 ServerFinder::listen_thread ()
+try
 {
 	while (1) {
 		shared_ptr<Socket> sock (new Socket (10));
@@ -117,6 +123,10 @@ ServerFinder::listen_thread ()
 		}
 	}
 }
+catch (...)
+{
+	store_current ();
+}
 
 bool
 ServerFinder::server_found (string ip) const