X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsocket_test.cc;h=5024272abce3eb99cb6805b8fcbadc9a92e24d60;hb=e3c7656f9dc0acbaf518c051b847ee2e4eb7ba23;hp=562d106396bb193ff8beec53b6280938a4b9c973;hpb=09860271bb6d03b3937c08bffb4c672697f6d711;p=dcpomatic.git

diff --git a/test/socket_test.cc b/test/socket_test.cc
index 562d10639..5024272ab 100644
--- a/test/socket_test.cc
+++ b/test/socket_test.cc
@@ -48,8 +48,11 @@ public:
 
 	~TestServer ()
 	{
+		boost::this_thread::disable_interruption dis;
 		stop ();
-		_thread.join ();
+		try {
+			_thread.join ();
+		} catch (...) {}
 		delete[] _buffer;
 	}