X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fsetformat.C;h=af83439737b53a6985e93026b4a72f5b3395f297;hb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8;hp=17550381bbf7072ec9011885eb5f9a3f0335bf18;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/setformat.C b/cinelerra-5.1/cinelerra/setformat.C
index 17550381..af834397 100644
--- 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,