X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fpreferencesthread.C;h=8f95e11967ab8f3e33c893c3d71e3f49d741472f;hb=1784ebd93b6c278a5205f040b5b40d8bdd79ed8a;hp=d7c72b703e7e67bdd2b1a020f1a33fa871035a21;hpb=c0125dcc1658cafc4758cca0b5d8bf88a98ed948;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.0/cinelerra/preferencesthread.C b/cinelerra-5.0/cinelerra/preferencesthread.C index d7c72b70..8f95e119 100644 --- a/cinelerra-5.0/cinelerra/preferencesthread.C +++ b/cinelerra-5.0/cinelerra/preferencesthread.C @@ -153,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); } @@ -199,6 +201,9 @@ int PreferencesThread::apply_settings() (*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) || !preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1); + 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(); @@ -207,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();