fix histogram bez keyframe interp, update plugins/fonts/fonts.scale, edl copy clip...

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

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index 01fb08b2357655fef946140f5dc1f6bc31817823..fbac1848a2f00fa052339c2ec7a44f69ba8793ab 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -64,7 +64,7 @@
 
 
 
-#define WIDTH 800
+#define WIDTH 860
 #define HEIGHT 700
 
 
@@ -228,14 +228,16 @@ 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 ) {
+       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;
@@ -262,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();
@@ -640,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)