upgrade to ffmpeg 4.2, rework mask for speedup

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / gwindowgui.C

diff --git a/cinelerra-5.1/cinelerra/gwindowgui.C b/cinelerra-5.1/cinelerra/gwindowgui.C
index f90a387815add0beaf2a066a44ae59f8059f5d78..53061be9ffbddf048d3ebeff3d23b7e30b49d236 100644 (file)
--- a/cinelerra-5.1/cinelerra/gwindowgui.C
+++ b/cinelerra-5.1/cinelerra/gwindowgui.C
@@ -209,7 +209,6 @@ GWindowColorButton::~GWindowColorButton()
 int GWindowColorButton::handle_new_color(int color, int alpha)
 {
        this->color = color;
-       color_thread->update_lock->unlock();
        return 1;
 }
 
@@ -252,7 +251,9 @@ void GWindowGUI::create_objects()
                        continue;
                }
                const char *label = toggle_text(tp);
-               int color = tp->isauto > 0 ? auto_colors[tp->ref] : WHITE;
+               int color = tp->isauto > 0 ?
+                       auto_colors[tp->ref] :
+                       get_resources()->text_default ;
                GWindowToggle *toggle = new GWindowToggle(this, x, y, label, color, tp);
                add_tool(toggles[i] = toggle);
                if( tp->isauto > 0 ) {