X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferencesthread.C;h=af64fed165775894bd6c9908a9dfcc946b0e3601;hp=b25075b8657fb1ce91113c74e9dcadd88abe76a6;hb=7eded24eb31529ad7652dea64e34b0a6210e5be1;hpb=047485402c380ee034045712121c649ddf89eda4

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index b25075b8..af64fed1 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 840
 #define HEIGHT 700
 
 
@@ -225,15 +226,25 @@ 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
 	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);
-	mwindow->init_brender();
 
 	BC_Signals::set_catch_segv(mwindow->preferences->trap_sigsegv);
 	BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);
@@ -631,6 +642,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)