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

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

diff --git a/cinelerra-5.1/cinelerra/dv1394input.C b/cinelerra-5.1/cinelerra/dv1394input.C
index ebd18cf11807bca6415df5f9006a1f9c21c13fc2..f8dd1f3a5071dcaa015e52d739b41441fe4d2286 100644 (file)
--- a/cinelerra-5.1/cinelerra/dv1394input.C
+++ b/cinelerra-5.1/cinelerra/dv1394input.C
@@ -38,8 +38,8 @@ DV1394Input::~DV1394Input()
        {
                done = 1;
                Thread::cancel();
        {
                done = 1;
                Thread::cancel();

-               Thread::join();

        }
        }

+       Thread::join();

 
        if(fd > 0) close(fd);
 }
 
        if(fd > 0) close(fd);
 }