awindowgui / mwindowedit / label rework

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

diff --git a/cinelerra-5.1/cinelerra/setformat.C b/cinelerra-5.1/cinelerra/setformat.C
index 17550381bbf7072ec9011885eb5f9a3f0335bf18..af83439737b53a6985e93026b4a72f5b3395f297 100644 (file)
--- a/cinelerra-5.1/cinelerra/setformat.C
+++ b/cinelerra-5.1/cinelerra/setformat.C
@@ -94,8 +94,8 @@ SetFormatThread::~SetFormatThread()
        if( running() ) {
                window->set_done(1);
                cancel();
-               join();
        }
+       join();
        delete window_lock;
 }
 
@@ -159,6 +159,7 @@ void SetFormatThread::apply_changes()
        mwindow->edl->copy_session(new_settings, 1);
        mwindow->edl->session->output_w = dimension[0];
        mwindow->edl->session->output_h = dimension[1];
+       mwindow->edl->retrack();
        mwindow->edl->rechannel();
        mwindow->edl->resample(old_samplerate, new_samplerate, TRACK_AUDIO);
        mwindow->edl->resample(old_framerate, new_framerate, TRACK_VIDEO);
@@ -479,7 +480,7 @@ void SetFormatWindow::create_objects()
                thread,
                &(thread->new_settings->session->aspect_w)));
        x += aspect_w->get_w() + 5;
-       add_subwindow(new BC_Title(x, y, _(":")));
+       add_subwindow(new BC_Title(x, y, ":"));
        x += 10;
        add_subwindow(aspect_h = new ScaleAspectText(x,
                y,