summaryrefslogtreecommitdiff
path: root/gtk2_ardour/route_ui.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-11-14 17:49:37 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-11-14 17:49:37 +0000
commit154f2eec09d87c4b393102a9edbb2b7cdf5687a2 (patch)
treef63a7937040d86ab3b9ca5f9ce0404452209d11f /gtk2_ardour/route_ui.cc
parentc66955386ecfb86b3dd2b137a8e6e4143711f329 (diff)
master mute button should not show Mid state since master is never muted-by-others
git-svn-id: svn://localhost/ardour2/branches/3.0@10587 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
-rw-r--r--gtk2_ardour/route_ui.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 3eca92702a..8f8626f7ba 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1071,7 +1071,8 @@ RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
if (r->muted ()) {
/* full mute */
return Active;
- } else if (s->soloing() && !r->soloed() && !r->solo_isolated()) {
+ } else if (!r->is_master() && s->soloing() && !r->soloed() && !r->solo_isolated()) {
+ /* master is NEVER muted by others */
return Mid;
} else {
/* no mute at all */