fixes for full timeline updates, replace nums with syms for update interface

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

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index fbac1848a2f00fa052339c2ec7a44f69ba8793ab..28b5ecc37c4975ec1b0c7972f097c92b006d58bb 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -231,10 +231,12 @@ int PreferencesThread::apply_settings()
        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->theme, mwindow->preferences->theme) ||
+           strcmp(preferences->plugin_icons, mwindow->preferences->plugin_icons) ||
+           preferences->awindow_picon_h != mwindow->preferences->awindow_picon_h ||
+           preferences->vicon_size != mwindow->preferences->vicon_size ||
+           preferences->vicon_color_mode != mwindow->preferences->vicon_color_mode )
+               mwindow->restart_status = -1;  // reconstruct/restart program
        if( strcmp(preferences->lv2_path, mwindow->preferences->lv2_path) != 0 )
                reload_plugins = 1;
        if( reload_plugins ) {
@@ -327,7 +329,7 @@ int PreferencesThread::apply_settings()
        if(redraw_times)
        {
                mwindow->gui->lock_window("PreferencesThread::apply_settings 3");
-               mwindow->gui->update(0, 0, 1, 0, 0, 1, 0);
+               mwindow->gui->update(0, NO_DRAW, 1, 0, 0, 1, 0);
                mwindow->gui->redraw_time_dependancies();
                mwindow->gui->unlock_window();
        }