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=9a995958c27377fd0c3a1762ddb5af763ea831e4;hb=fb661e853152fd63537629a20f493a4cdcd4f019;hpb=827586949547b489a6a842729ad01a983f3eb051 diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C index 9a995958..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,8 +1277,10 @@ void ColorButtonPicker::update(int color, int alpha) int ColorButtonPicker::handle_new_color(int color, int alpha) { - update(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()