p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / shbtnprefs.C

diff --git a/cinelerra-5.1/cinelerra/shbtnprefs.C b/cinelerra-5.1/cinelerra/shbtnprefs.C
index cad3a6a2e9012ebee927a38e21d11a15c1ce6ae0..b1de0be6c3310f3867bec76418069654fe3d80be 100644 (file)
--- a/cinelerra-5.1/cinelerra/shbtnprefs.C
+++ b/cinelerra-5.1/cinelerra/shbtnprefs.C
@@ -200,6 +200,7 @@ ShBtnErrWarn::~ShBtnErrWarn()
 
 void ShBtnTextWindow::create_objects()
 {
+       lock_window("ShBtnTextWindow::create_objects");
         int x = 10, y = 10;
        int x1 = 160;
        BC_Title *title = new BC_Title(x, y, _("Label:"));
@@ -217,6 +218,7 @@ void ShBtnTextWindow::create_objects()
         y = get_h() - ShBtnTextOK::calculate_h() - 10;
         add_subwindow(new ShBtnTextOK(this, x, y));
         show_window();
+       unlock_window();
 }
 
 ShBtnTextOK::ShBtnTextOK(ShBtnTextWindow *st_window, int x, int y)
@@ -267,6 +269,7 @@ int ShBtnTextDialog::start_edit(ShBtnPref *pref)
 
 void ShBtnEditWindow::create_objects()
 {
+       lock_window("ShBtnEditWindow::create_objects");
        Preferences *preferences = shbtn_edit->pwindow->thread->preferences;
        for( int i=0; i<preferences->shbtn_prefs.size(); ++i ) {
                shbtn_items.append(new ShBtnPrefItem(preferences->shbtn_prefs[i]));
@@ -281,6 +284,7 @@ void ShBtnEditWindow::create_objects()
        add_subwindow(edit_button = new ShBtnEditButton(this, x, y));
        add_subwindow(new BC_OKButton(this));
        show_window();
+       unlock_window();
 }
 
 int ShBtnEditWindow::start_edit(ShBtnPref *pref)