summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-02-27 16:40:53 +0100
committerPaul Davis <paul@linuxaudiosystems.com>2017-02-27 16:40:53 +0100
commite5c6f16126e0901654b09ecce990554b1ff73833 (patch)
treec8058d11c837fefcd2659cf18bd34066125a33e3
parent007808a6ad96f38e84ce1db12d448628d80baa0a (diff)
fix crash caused by trying to connect monitor section before it has ports.5.8
This does not fix the ordering issues caused by things happening before the monitor section gaining ports
-rw-r--r--libs/ardour/auditioner.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index e1c04c462a..b190165c72 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -137,25 +137,25 @@ Auditioner::connect ()
via_monitor = false;
if (left.empty() || left == "default") {
- if (_session.monitor_out()) {
- left = _session.monitor_out()->input()->audio (0)->name();
- via_monitor = true;
- } else {
+ if (_session.monitor_out() && _session.monitor_out()->input()->audio (0)) {
+ left = _session.monitor_out()->input()->audio (0)->name();
+ via_monitor = true;
+ } else {
if (outputs.size() > 0) {
left = outputs[0];
}
- }
+ }
}
if (right.empty() || right == "default") {
- if (_session.monitor_out()) {
- right = _session.monitor_out()->input()->audio (1)->name();
- via_monitor = true;
- } else {
+ if (_session.monitor_out() && _session.monitor_out()->input()->audio (1)) {
+ right = _session.monitor_out()->input()->audio (1)->name();
+ via_monitor = true;
+ } else {
if (outputs.size() > 1) {
right = outputs[1];
}
- }
+ }
}
_output->disconnect (this);