From e5c6f16126e0901654b09ecce990554b1ff73833 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 27 Feb 2017 16:40:53 +0100 Subject: [PATCH] fix crash caused by trying to connect monitor section before it has ports. This does not fix the ordering issues caused by things happening before the monitor section gaining ports --- libs/ardour/auditioner.cc | 20 ++++++++++---------- 1 file 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); -- 2.30.2