X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.C;h=927807b619e0462c3d8f115cc11001c0ae7094c5;hb=59e74f262d7b6be235f2bbfaac35ef4274f52dc9;hp=f40a95f8250616ffd43568ffc3df531171a95090;hpb=3d7a882d0808f456957f823454bd84ff8317a51a;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C
index f40a95f8..927807b6 100644
--- a/cinelerra-5.1/cinelerra/colorpicker.C
+++ b/cinelerra-5.1/cinelerra/colorpicker.C
@@ -96,7 +96,7 @@ void ColorPicker::update_gui(int output, int alpha)
 {
 	ColorWindow *gui = (ColorWindow *)get_gui();
 	if( !gui ) return;
-	gui->lock_window();
+	gui->lock_window("ColorPicker::update_gui");
 	this->output = output;
 	this->alpha = alpha;
 	gui->change_values();
@@ -1342,7 +1342,8 @@ void ColorBoxButton::create_objects()
 
 void ColorBoxButton::set_color(int color)
 {
-	this->color = color;
+	this->color = (color & 0xffffff);
+	this->alpha = (~color>>24) & 0xff;
 	int r = (color>>16) & 0xff;
 	int g = (color>> 8) & 0xff;
 	int b = (color>> 0) & 0xff;
@@ -1403,7 +1404,8 @@ void ColorCircleButton::create_objects()
 
 void ColorCircleButton::set_color(int color)
 {
-	this->color = color;
+	this->color = (color & 0xffffff);
+	this->alpha = (~color>>24) & 0xff;
 	int r = (color>>16) & 0xff;
 	int g = (color>>8) & 0xff;
 	int b = (color>>0) & 0xff;