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

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

diff --git a/cinelerra-5.1/cinelerra/channeledit.C b/cinelerra-5.1/cinelerra/channeledit.C
index 91b7c11b0f39b48067dc562aadd920f70c46c703..6e02639ebc029618e7fdf88b216da86c6fb540c8 100644 (file)
--- a/cinelerra-5.1/cinelerra/channeledit.C
+++ b/cinelerra-5.1/cinelerra/channeledit.C
@@ -765,8 +765,8 @@ void ScanThread::stop()
        if( !interrupt ) {
 // Cancel previous job
                interrupt = 1;
-               Thread::join();
        }
+       Thread::join();
        if( progress ) {
                progress->stop_progress();
                delete progress;  progress = 0;