From: Good Guy <good1.2guy@gmail.com>
Date: Tue, 12 Apr 2016 21:50:35 +0000 (-0600)
Subject: fix for join strategy change
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=b353ad3a849cea55d23b01ae3cdc275b1e631b05;p=goodguy%2Fhistory.git

fix for join strategy change
---

diff --git a/cinelerra-5.1/cinelerra/channeledit.C b/cinelerra-5.1/cinelerra/channeledit.C
index 6e02639e..d1f5603f 100644
--- a/cinelerra-5.1/cinelerra/channeledit.C
+++ b/cinelerra-5.1/cinelerra/channeledit.C
@@ -762,10 +762,8 @@ ScanThread::~ScanThread()
 
 void ScanThread::stop()
 {
-	if( !interrupt ) {
 // Cancel previous job
-		interrupt = 1;
-	}
+	interrupt = 1;
 	Thread::join();
 	if( progress ) {
 		progress->stop_progress();
diff --git a/cinelerra-5.1/cinelerra/filethread.C b/cinelerra-5.1/cinelerra/filethread.C
index f8744545..c5b28785 100644
--- a/cinelerra-5.1/cinelerra/filethread.C
+++ b/cinelerra-5.1/cinelerra/filethread.C
@@ -501,8 +501,8 @@ int FileThread::stop_reading()
 	{
 		done = 1;
 		read_wait_lock->unlock();
+		Thread::join();
 	}
-	Thread::join();
 	return 0;
 }