X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferencesthread.C;h=bf921724d531bee53da724ae209c508aa9aae89b;hb=418e8644335db47143bc421f11be2c2e68901d45;hp=39a198d435cbef017e33cc449e6f050266bc1f3e;hpb=243336668c89096732786c6b3f3c5918aa2eff26;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index 39a198d4..bf921724 100644
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -225,6 +225,10 @@ int PreferencesThread::apply_settings()
 		mwindow->gui->unlock_window();
 		redraw_overlays = 1;
 	}
+	PreferencesWindow *window = (PreferencesWindow*)get_gui();
+	if( window ) window->unlock_window();
+	mwindow->init_brender();
+	if( window ) window->lock_window("PreferencesThread::apply_settings 5");
 
 	if( strcmp(preferences->theme, mwindow->preferences->theme) != 0 )
 		mwindow->restart_status = -1; // reload, need new bcresources
@@ -233,7 +237,6 @@ int PreferencesThread::apply_settings()
 
 	mwindow->edl->copy_session(edl, 1);
 	mwindow->preferences->copy_from(preferences);
-	mwindow->init_brender();
 
 	BC_Signals::set_catch_segv(mwindow->preferences->trap_sigsegv);
 	BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);
@@ -248,7 +251,7 @@ int PreferencesThread::apply_settings()
 	}
 
 	mwindow->reset_android_remote();
-	int ffmpeg_early_probe = mwindow->preferences->get_file_probe_armed("FFPMEG_Early");
+	int ffmpeg_early_probe = mwindow->preferences->get_file_probe_armed("FFMPEG_Early");
 	mwindow->gui->ffmpeg_toggle->update(ffmpeg_early_probe);
 	mwindow->gui->ffmpeg_toggle->set_tooltip(ffmpeg_early_probe ?
 		FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);