Fix OSC crash when there's no master bus
This commit is contained in:
parent
6f95dfdc31
commit
925d25851d
@ -1224,7 +1224,7 @@ OSC::routes_list (lo_message msg)
|
|||||||
} else if (boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
|
} else if (boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
|
||||||
if (!(s->presentation_info().flags() & PresentationInfo::MidiBus)) {
|
if (!(s->presentation_info().flags() & PresentationInfo::MidiBus)) {
|
||||||
// r->feeds (session->master_out()) may make more sense
|
// 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
|
// this is a bus
|
||||||
lo_message_add_string (reply, "B");
|
lo_message_add_string (reply, "B");
|
||||||
} else {
|
} else {
|
||||||
@ -6379,7 +6379,9 @@ OSC::get_sorted_stripables(std::bitset<32> types, bool cue, uint32_t custom, Sor
|
|||||||
if (!custom) {
|
if (!custom) {
|
||||||
// Master/Monitor might be anywhere... we put them at the end - Sorry ;)
|
// Master/Monitor might be anywhere... we put them at the end - Sorry ;)
|
||||||
if (types[5]) {
|
if (types[5]) {
|
||||||
sorted.push_back (session->master_out());
|
if (session->master_out()) {
|
||||||
|
sorted.push_back (session->master_out());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (types[6]) {
|
if (types[6]) {
|
||||||
if (session->monitor_out()) {
|
if (session->monitor_out()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user