p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...

[goodguy/history.git] / cinelerra-5.1 / guicast / bcprogressbox.C

diff --git a/cinelerra-5.1/guicast/bcprogressbox.C b/cinelerra-5.1/guicast/bcprogressbox.C
index 69cc52b16c58e384daf6a587f8b0c566f19902a4..fde9580411c60e4e7b1266a16d51e9e7bfedfe5f 100644 (file)
--- a/cinelerra-5.1/guicast/bcprogressbox.C
+++ b/cinelerra-5.1/guicast/bcprogressbox.C
@@ -97,8 +97,8 @@ int BC_ProgressBox::stop_progress()
 {
        if( Thread::running() ) {
                pwindow->set_done(0);
-               Thread::join();
        }
+       Thread::join();
        return 0;
 }
 
@@ -133,7 +133,7 @@ BC_ProgressWindow::~BC_ProgressWindow()
 int BC_ProgressWindow::create_objects(const char *text, int64_t length)
 {
        int x = 10, y = 10;
-
+       lock_window("BC_ProgressWindow::create_objects");
 // Recalculate width based on text
        if(text)
        {
@@ -151,7 +151,7 @@ int BC_ProgressWindow::create_objects(const char *text, int64_t length)
        add_tool(bar = new BC_ProgressBar(x, y, get_w() - 20, length));
        add_tool(new BC_CancelButton(this));
        show_window(1);
-
+       unlock_window();
        return 0;
 }