ffmpeg param visibility, high422 x264 profile, bd/dvd enhancements

[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 6e02639ebc029618e7fdf88b216da86c6fb540c8..985323690442870f7cf30b4364d78cf3afce366e 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();
@@ -828,6 +826,7 @@ void ScanThread::run()
                edit->window->update_list();
                edit->window->unlock_window();
        }
+       edit->window->set_done(interrupt || progress->is_cancelled() ? 1 : 0);
 }