X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.C;h=57601d7e7bbb7e5dab408d2829c005af9623d2ee;hp=b910b9f4cab42dc2d5ce6a201815b4be97ee5396;hb=8e67d840c5a93f77de021102a4f0bfc4e07504f4;hpb=9668279ccef86a9cc9138aaa1a659f158698f829

diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C
index b910b9f4..57601d7e 100644
--- a/cinelerra-5.1/cinelerra/colorpicker.C
+++ b/cinelerra-5.1/cinelerra/colorpicker.C
@@ -311,7 +311,9 @@ void ColorWindow::update_display()
 
 int ColorWindow::handle_event()
 {
+	unlock_window();
 	thread->handle_new_color(rgb888(), alpha8());
+	lock_window("ColorWindow::handle_event");
 	return 1;
 }
 
@@ -1275,9 +1277,10 @@ void ColorButtonPicker::update(int color, int alpha)
 
 int ColorButtonPicker::handle_new_color(int color, int alpha)
 {
-	update(color, alpha);
-	color_button->handle_new_color(color, alpha);
-	return 1;
+	color_button->lock_window("ColorButtonPicker::handle_new_color");
+	color_button->update_gui(color, alpha);
+	color_button->unlock_window();
+	return color_button->handle_new_color(color, alpha);
 }
 
 void ColorButtonPicker::update_gui()
@@ -1290,6 +1293,7 @@ void ColorButtonPicker::update_gui()
 void ColorButtonPicker::update_gui(int color, int alpha)
 {
 	ColorPicker::update_gui(color, alpha);
+	color_button->handle_new_color(color, alpha);
 }
 
 ColorButtonThread::ColorButtonThread(ColorButton *color_button)