ardour/livetrax
13
0
Fork 0
Code

Fix OSC crash when there's no master bus

Browse Source
This commit is contained in:
Robin Gareus 2019-04-03 03:35:13 +02:00
parent 6f95dfdc31
commit 925d25851d
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/surfaces/osc/osc.cc
View File

@ -1224,7 +1224,7 @@ OSC::routes_list (lo_message msg)
} else if (boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
if (!(s->presentation_info().flags() & PresentationInfo::MidiBus)) {
// r->feeds (session->master_out()) may make more sense
if (r->direct_feeds_according_to_reality (session->master_out())) {
if (session->master_out() && r->direct_feeds_according_to_reality (session->master_out())) {
// this is a bus
lo_message_add_string (reply, "B");
} else {
@ -6379,7 +6379,9 @@ OSC::get_sorted_stripables(std::bitset<32> types, bool cue, uint32_t custom, Sor
if (!custom) {
// Master/Monitor might be anywhere... we put them at the end - Sorry ;)
if (types[5]) {
sorted.push_back (session->master_out());
if (session->master_out()) {
sorted.push_back (session->master_out());
}
}
if (types[6]) {
if (session->monitor_out()) {