DecoderStack: Fixed thread dead-lock
authorJoel Holdsworth <joel@airwebreathe.org.uk>
Thu, 5 Jun 2014 20:28:59 +0000 (21:28 +0100)
committerJoel Holdsworth <joel@airwebreathe.org.uk>
Thu, 5 Jun 2014 20:28:59 +0000 (21:28 +0100)
pv/data/decoderstack.cpp

index 31dc8b309221c4721a01e3d881255955cf2ff7e5..414aaf0ca1ae338629fdcf2e60ce5b4dd4c5fafd 100644 (file)
@@ -81,6 +81,7 @@ DecoderStack::~DecoderStack()
 {
        if (_decode_thread.joinable()) {
                _interrupt = true;
 {
        if (_decode_thread.joinable()) {
                _interrupt = true;
+               _input_cond.notify_one();
                _decode_thread.join();
        }
 }
                _decode_thread.join();
        }
 }
@@ -185,6 +186,7 @@ void DecoderStack::begin_decode()
 
        if (_decode_thread.joinable()) {
                _interrupt = true;
 
        if (_decode_thread.joinable()) {
                _interrupt = true;
+               _input_cond.notify_one();
                _decode_thread.join();
        }
 
                _decode_thread.join();
        }