avoid overloaded casting pun tripping compiler

[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..985323690442870f7cf30b4364d78cf3afce366e 100644 (file)
--- a/cinelerra-5.1/cinelerra/channeledit.C
+++ b/cinelerra-5.1/cinelerra/channeledit.C
@@ -762,11 +762,9 @@ ScanThread::~ScanThread()
 
 void ScanThread::stop()
 {
-       if( !interrupt ) {
 // Cancel previous job
-               interrupt = 1;
-               Thread::join();
-       }
+       interrupt = 1;
+       Thread::join();
        if( progress ) {
                progress->stop_progress();
                delete progress;  progress = 0;
@@ -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);
 }