summaryrefslogtreecommitdiff
path: root/gtk2_ardour/mixer_ui.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2016-12-21 12:14:44 +0100
committerRobin Gareus <robin@gareus.org>2016-12-21 12:14:44 +0100
commit0053abbaae28499fc2815043abc140f2070b98f3 (patch)
treed5e693556c5a7daaba96d89599cd77408a9eecb8 /gtk2_ardour/mixer_ui.cc
parenta18c13cf21025eb5e1faef2e5bb222c01101259f (diff)
backport/minimize difference to mixbus branch
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
-rw-r--r--gtk2_ardour/mixer_ui.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 9e5d6e23c6..340a5a55ec 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -1519,7 +1519,11 @@ Mixer_UI::move_stripable_into_view (boost::shared_ptr<ARDOUR::Stripable> s)
if (s->presentation_info().special () || s->presentation_info().flag_match (PresentationInfo::VCA)) {
return;
}
-
+#ifdef MIXBUS
+ if (s->mixbus ()) {
+ return;
+ }
+#endif
bool found = false;
int x0 = 0;
for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {