summaryrefslogtreecommitdiff
path: root/libs/surfaces/osc
diff options
context:
space:
mode:
authorLen Ovens <len@ovenwerks.net>2018-11-07 18:09:50 -0800
committerLen Ovens <len@ovenwerks.net>2018-11-12 22:30:32 -0800
commit1b2b3452cba03e47b2331aa2f6056c629e30487d (patch)
tree269413404b693e84a0cccae5028e0364ab7433eb /libs/surfaces/osc
parent848187b264bda071253dc48814d26237c06b9d07 (diff)
OSC: logic thinko fix
Diffstat (limited to 'libs/surfaces/osc')
-rw-r--r--libs/surfaces/osc/osc.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index aa76983fdc..da3c5ff169 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -6349,15 +6349,17 @@ OSC::get_sorted_stripables(std::bitset<32> types, bool cue, uint32_t custom, Sor
sorted.push_back (s);
} else if (types[4] && boost::dynamic_pointer_cast<VCA>(s)) {
sorted.push_back (s);
- } else if (types[7] && s->is_listenbus()) {
- sorted.push_back (s);
+ } else if (s->is_listenbus()) {
+ if (types[7]) {
+ sorted.push_back (s);
+ }
} else
#ifdef MIXBUS
if (types[2] && Profile->get_mixbus() && s->mixbus()) {
sorted.push_back (s);
} else
#endif
- if ((types[2] || types[3]) && boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
+ if (boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(s);
if (!(s->presentation_info().flags() & PresentationInfo::MidiBus)) {
// note some older sessions will show midibuses as busses