X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.C;h=72efa4a69fff306cda3519d97c647d7ad6e63f83;hp=b910b9f4cab42dc2d5ce6a201815b4be97ee5396;hb=f41ee8a0f00338fffb7fd6760a5ecd04c0101a41;hpb=9668279ccef86a9cc9138aaa1a659f158698f829 diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C index b910b9f4..72efa4a6 100644 --- a/cinelerra-5.1/cinelerra/colorpicker.C +++ b/cinelerra-5.1/cinelerra/colorpicker.C @@ -1275,9 +1275,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 +1291,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)