Fix bugs in thread termination causing occasional pthread

[dcpomatic.git] / test / socket_test.cc

diff --git a/test/socket_test.cc b/test/socket_test.cc
index 562d106396bb193ff8beec53b6280938a4b9c973..5024272abce3eb99cb6805b8fcbadc9a92e24d60 100644 (file)
--- 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;
        }