X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferencesthread.C;h=fbac1848a2f00fa052339c2ec7a44f69ba8793ab;hb=04031cc2a664d2a6d9d2a37954c55cc68742d78c;hp=bf921724d531bee53da724ae209c508aa9aae89b;hpb=efc8fa7dc7ddcdeaa9398e09d81975a6ccf526fc;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index bf921724..fbac1848 100644
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -32,6 +32,7 @@
 #include "bchash.h"
 #include "edl.h"
 #include "edlsession.h"
+#include "file.h"
 #include "filesystem.h"
 #include "fonts.h"
 #include "interfaceprefs.h"
@@ -63,7 +64,7 @@
 
 
 
-#define WIDTH 800
+#define WIDTH 860
 #define HEIGHT 700
 
 
@@ -227,13 +228,20 @@ int PreferencesThread::apply_settings()
 	}
 	PreferencesWindow *window = (PreferencesWindow*)get_gui();
 	if( window ) window->unlock_window();
-	mwindow->init_brender();
+	mwindow->stop_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
 	if( strcmp(preferences->plugin_icons, mwindow->preferences->plugin_icons) != 0 )
 		mwindow->restart_status = -1;
+	if( strcmp(preferences->lv2_path, mwindow->preferences->lv2_path) != 0 )
+		reload_plugins = 1;
+	if( reload_plugins ) {
+		MWindow::remove_plugin_index();
+		File::setenv_path("LV2_PATH", preferences->lv2_path, 1);
+		mwindow->restart_status = -1;
+	}
 
 	mwindow->edl->copy_session(edl, 1);
 	mwindow->preferences->copy_from(preferences);
@@ -256,6 +264,7 @@ int PreferencesThread::apply_settings()
 	mwindow->gui->ffmpeg_toggle->set_tooltip(ffmpeg_early_probe ?
 		FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
 	mwindow->gui->mainshbtns->load(mwindow->preferences);
+	mwindow->init_brender();
 
 //edl->session->recording_format->dump();
 //mwindow->edl->session->recording_format->dump();
@@ -634,6 +643,7 @@ PreferencesApply::PreferencesApply(MWindow *mwindow, PreferencesThread *thread)
 int PreferencesApply::handle_event()
 {
 	thread->apply_settings();
+	mwindow->save_defaults();
 	return 1;
 }
 int PreferencesApply::resize_event(int w, int h)