diff options
Diffstat (limited to 'src/lib/encode_server.cc')
| -rw-r--r-- | src/lib/encode_server.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc index c30fc8f30..f4224798b 100644 --- a/src/lib/encode_server.cc +++ b/src/lib/encode_server.cc @@ -83,6 +83,8 @@ EncodeServer::EncodeServer (bool verbose, int num_threads) EncodeServer::~EncodeServer () { + boost::this_thread::disable_interruption dis; + { boost::mutex::scoped_lock lm (_mutex); _terminate = true; @@ -104,13 +106,9 @@ EncodeServer::~EncodeServer () } _broadcast.io_service.stop (); - if (_broadcast.thread.joinable()) { - try { - _broadcast.thread.join (); - } catch (...) { - - } - } + try { + _broadcast.thread.join (); + } catch (...) {} } /** @param after_read Filled in with gettimeofday() after reading the input from the network. |