X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fshbtnprefs.C;h=b1de0be6c3310f3867bec76418069654fe3d80be;hb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da;hp=b4ee516a9d14ace3f503e7185e3ee808166a3cb6;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/shbtnprefs.C b/cinelerra-5.1/cinelerra/shbtnprefs.C
index b4ee516a..b1de0be6 100644
--- 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:"));
@@ -212,11 +213,12 @@ void ShBtnTextWindow::create_objects()
         add_subwindow(cmd_name);
         cmd_text = new BC_ScrollTextBox(this, x1, y, get_w()-x1-20, 4, pref->commands);
 	cmd_text->create_objects();
-	y += cmd_text->get_h() + 8;
+	y += cmd_text->get_h() + 16;
         add_subwindow(st_err_warn = new ShBtnErrWarn(this, x1, y));
         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)