diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 54bf7727d2..a09b9bf53a 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1416,6 +1416,7 @@ MixerStrip::reset_strip_style () { if (_current_delivery && boost::dynamic_pointer_cast(_current_delivery)) { + gpm.unset_fader_fg (); gpm.set_fader_name ("SendStripBase"); } else { @@ -1439,7 +1440,7 @@ MixerStrip::reset_strip_style () } else { set_name ("AudioTrackStripBaseInactive"); } - if (!is_master() && UIConfiguration::instance().get_use_route_color_widely()) { + if (UIConfiguration::instance().get_use_route_color_widely()) { // gpm.set_fader_bg (); gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint())); } else { @@ -1453,7 +1454,7 @@ MixerStrip::reset_strip_style () set_name ("AudioBusStripBaseInactive"); } - if (UIConfiguration::instance().get_use_route_color_widely()) { + if (!is_master() && UIConfiguration::instance().get_use_route_color_widely()) { // gpm.set_fader_bg (); gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint())); } else { @@ -1810,7 +1811,7 @@ MixerStrip::parameter_changed (string p) } } else if (p == "show-triggers-inline") { /* XXX do something or get rid of this parameter */ - } else if (p == "use-route-color-for-bg") { + } else if (p == "use-route-color-widely") { reset_strip_style (); } } diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index e99b91d602..eb8d524e12 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -497,7 +497,7 @@ RouteTimeAxisView::parameter_changed (string const & p) } else { gm.get_level_meter().set_max_audio_meter_count (0); } - } else if (p == "use-route-color-for-bg") { + } else if (p == "use-route-color-widely") { route_color_changed (); } } @@ -1037,7 +1037,7 @@ RouteTimeAxisView::route_color_changed () } number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color())); - if (UIConfiguration::instance().get_use_route_color_widely()) { + if (!is_master() && UIConfiguration::instance().get_use_route_color_widely()) { gm.set_fader_fg (gdk_color_to_rgba (route_color_tint ())); } else { gm.unset_fader_fg ();