change thread join strategy, fix a few leaks, fix a few bugs

[goodguy/history.git] / cinelerra-5.1 / cinelerra / device1394output.C

diff --git a/cinelerra-5.1/cinelerra/device1394output.C b/cinelerra-5.1/cinelerra/device1394output.C
index f021a165b35585241c3a42cfd6b3768c2c4da611..6aa493e20dd376a143feb26cc29e41f8d626b7be 100644 (file)
--- a/cinelerra-5.1/cinelerra/device1394output.C
+++ b/cinelerra-5.1/cinelerra/device1394output.C
@@ -79,8 +79,8 @@ Device1394Output::~Device1394Output()
                done = 1;
                start_lock->unlock();
                Thread::cancel();
                done = 1;
                start_lock->unlock();
                Thread::cancel();

-               Thread::join();

        }
        }

+       Thread::join();

 
        if(buffer)
        {
 
        if(buffer)
        {