X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fdevicev4l2base.C;h=31a009b38fb9ea3b6c40303957dc646acfb4b6f6;hb=32fa5523f2d5a7d6abcbdddce56b8d65cd83fb88;hp=efc3c0616fdd7ceac574369f5242aa050098fa88;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/devicev4l2base.C b/cinelerra-5.1/cinelerra/devicev4l2base.C
index efc3c061..31a009b3 100644
--- a/cinelerra-5.1/cinelerra/devicev4l2base.C
+++ b/cinelerra-5.1/cinelerra/devicev4l2base.C
@@ -165,8 +165,8 @@ DeviceV4L2Put::~DeviceV4L2Put()
 		done = 1;
 		buffer_lock->unlock();
 		Thread::cancel();
-		Thread::join();
 	}
+	Thread::join();
 	delete buffer_lock;
 	delete putq;
 }
@@ -709,8 +709,8 @@ void DeviceV4L2Base::close_dev()
 		{
 			done = 1;
 			Thread::cancel();
-			Thread::join();
 		}
+		Thread::join();
 		if(put_thread)
 		{
 			delete put_thread;