fix for join strategy change

diff --git a/cinelerra-5.1/cinelerra/channeledit.C b/cinelerra-5.1/cinelerra/channeledit.C
index 6e02639ebc029618e7fdf88b216da86c6fb540c8..d1f5603f4e1c1d109b20903ad1baf686bd7b62d4 100644 (file)
--- 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 f8744545493919c33a26af82ecf0a34a130cfbf3..c5b28785c03cd7f491adb61c1f5fb59d56a58b52 100644 (file)
--- 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;
 }