Fix route color selection dialog

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index e78e2fd8b464b0748ff7e9f9302c5bc6c959bbf9..ca008e2f985c8740432510fdf0709412a7e20244 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1561,7 +1561,7 @@ void
 RouteUI::choose_color ()
 {
        bool picked;
-       Gdk::Color c (gdk_color_from_rgb (_route->presentation_info().color()));
+       Gdk::Color c (gdk_color_from_rgba (_route->presentation_info().color()));
        Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &c);
 
        if (picked) {

diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 16607348f3531058eb94d56739614017ecb4c5ed..fce66bced1533f3a94927f8016c8c5f54d17d191 100644 (file)
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -276,7 +276,7 @@ Gdk::Color
 ARDOUR_UI_UTILS::gdk_color_from_rgba (uint32_t rgba)
 {
        Gdk::Color c;
-       set_color_from_rgb (c, rgba);
+       set_color_from_rgb (c, rgba >> 8);
        return c;
 }