summaryrefslogtreecommitdiff
path: root/gtk2_ardour/route_ui.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
-rw-r--r--gtk2_ardour/route_ui.cc20
1 files changed, 4 insertions, 16 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index bfd3ed1006..126e3af996 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1120,22 +1120,10 @@ RouteUI::solo_active_state (boost::shared_ptr<Route> r)
return Gtkmm2ext::Off;
}
- if (Config->get_solo_control_is_listen_control()) {
-
- if (r->listening_via_monitor()) {
- return Gtkmm2ext::ExplicitActive;
- } else {
- return Gtkmm2ext::Off;
- }
-
- }
-
- if (r->soloed()) {
- if (!r->self_soloed()) {
- return Gtkmm2ext::ImplicitActive;
- } else {
- return Gtkmm2ext::ExplicitActive;
- }
+ if (r->self_soloed()) {
+ return Gtkmm2ext::ExplicitActive;
+ } else if (r->soloed_by_others()) {
+ return Gtkmm2ext::ImplicitActive;
} else {
return Gtkmm2ext::Off;
}