Accessor for ClosedCaptionsDialog.

[dcpomatic.git] / src / lib / encode_server.cc

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 9902c8e84c65bf8d792700f6b2ce5594ea216c4d..314f8f68dcccda973d04ac683064fc2f25dec6de 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -97,9 +97,15 @@ EncodeServer::~EncodeServer ()
                delete i;
        }
 
-       if (_broadcast.socket) {
-               _broadcast.socket->close ();
+       {
+               boost::mutex::scoped_lock lm (_broadcast.mutex);
+               if (_broadcast.socket) {
+                       _broadcast.socket->close ();
+                       delete _broadcast.socket;
+                       _broadcast.socket = 0;
+               }
        }
+
        _broadcast.io_service.stop ();
        if (_broadcast.thread) {
                /* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we
@@ -306,10 +312,13 @@ EncodeServer::broadcast_received ()
                }
        }
 
-       _broadcast.socket->async_receive_from (
-               boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
-               _broadcast.send_endpoint, boost::bind (&EncodeServer::broadcast_received, this)
-               );
+       boost::mutex::scoped_lock lm (_broadcast.mutex);
+       if (_broadcast.socket) {
+               _broadcast.socket->async_receive_from (
+                       boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
+                       _broadcast.send_endpoint, boost::bind (&EncodeServer::broadcast_received, this)
+                       );
+       }
 }
 
 void
@@ -317,6 +326,9 @@ EncodeServer::handle (shared_ptr<Socket> socket)
 {
        boost::mutex::scoped_lock lock (_mutex);
 
+       Waker waker;
+       waker.nudge ();
+
        /* Wait until the queue has gone down a bit */
        while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) {
                _full_condition.wait (lock);