X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fpreferencesthread.C;h=f418ba25af742fd8510dff18ad94b5f6a2f0b1b9;hb=5aad2133f228b736f033d6c48e1629078b858286;hp=b52b3594f8f0767771727cb2c065e0a6f8268d3f;hpb=94e8dc2b306135e7735b2618a54f0f7de7ac7a0c;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.0/cinelerra/preferencesthread.C b/cinelerra-5.0/cinelerra/preferencesthread.C index b52b3594..f418ba25 100644 --- a/cinelerra-5.0/cinelerra/preferencesthread.C +++ b/cinelerra-5.0/cinelerra/preferencesthread.C @@ -49,6 +49,7 @@ #include "playbackprefs.h" #include "preferences.h" #include "recordprefs.h" +#include "shbtnprefs.h" #include "theme.h" #include "trackcanvas.h" #include "transportque.h" @@ -99,6 +100,7 @@ PreferencesThread::PreferencesThread(MWindow *mwindow) PreferencesThread::~PreferencesThread() { + close_window(); } BC_Window* PreferencesThread::new_gui() @@ -210,6 +212,7 @@ int PreferencesThread::apply_settings() mwindow->reset_android_remote(); mwindow->gui->mbuttons->ffmpeg_toggle->update(mwindow->preferences->ffmpeg_early_probe); + mwindow->gui->mainshbtns->load(mwindow->preferences); //edl->session->recording_format->dump(); //mwindow->edl->session->recording_format->dump();