gamma yuva hist fix, theme change without exit

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

diff --git a/cinelerra-5.0/cinelerra/preferencesthread.C b/cinelerra-5.0/cinelerra/preferencesthread.C
index 867898b49f84cf6aafb0f61c1054853a548cbd95..8f95e11967ab8f3e33c893c3d71e3f49d741472f 100644 (file)
--- a/cinelerra-5.0/cinelerra/preferencesthread.C
+++ b/cinelerra-5.0/cinelerra/preferencesthread.C
@@ -100,6 +100,7 @@ PreferencesThread::PreferencesThread(MWindow *mwindow)
 
 PreferencesThread::~PreferencesThread()
 {
+       close_window();
 }
 
 BC_Window* PreferencesThread::new_gui()
@@ -152,6 +153,8 @@ void PreferencesThread::handle_close_event(int result)
        edl = 0;
 
        mwindow->defaults->update("DEFAULTPREF", current_dialog);
+       if( mwindow->reload_status )
+               mwindow->gui->set_done(0);
 }
 
 
@@ -198,10 +201,9 @@ int PreferencesThread::apply_settings()
                (*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) ||
                !preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1);
 
-       if( preferences->file_forking != mwindow->preferences->file_forking ) {
-               MainError::show_error(
-                       _("Reseting file forking requires restarting cinelerra"));
-       }
+       if( strcmp(preferences->theme, mwindow->preferences->theme) != 0 )
+               mwindow->reload_status = 1;
+
        mwindow->edl->copy_session(edl, 1);
        mwindow->preferences->copy_from(preferences);
        mwindow->init_brender();
@@ -210,7 +212,7 @@ int PreferencesThread::apply_settings()
        BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);
 
        mwindow->reset_android_remote();
-       mwindow->gui->mbuttons->ffmpeg_toggle->update(mwindow->preferences->ffmpeg_early_probe);
+       mwindow->gui->ffmpeg_toggle->update(mwindow->preferences->ffmpeg_early_probe);
        mwindow->gui->mainshbtns->load(mwindow->preferences);
 
 //edl->session->recording_format->dump();