upgrade to ffmpeg-2.8

[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 b52b3594f8f0767771727cb2c065e0a6f8268d3f..f418ba25af742fd8510dff18ad94b5f6a2f0b1b9 100644 (file)
--- 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();