From 9ad08bfe973c72f2d73fae2be786d99efdc20a26 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 27 Oct 2009 00:53:24 +0000 Subject: [PATCH] Fix 2884 and also potential crash if there are no control outs. git-svn-id: svn://localhost/ardour2/branches/3.0@5935 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index d9c83a3ff3..c23712d1b9 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2432,13 +2432,13 @@ Session::route_solo_changed (void* /*src*/, boost::weak_ptr wpr) /* make sure master is never muted by solo */ - if (route != _master_out && _master_out->solo_level() == 0 && !_master_out->soloed()) { + if (_master_out && route != _master_out && _master_out->solo_level() == 0 && !_master_out->soloed()) { _master_out->mod_solo_level (1); } /* ditto for control outs make sure master is never muted by solo */ - if (route != _control_out && _control_out && _control_out->solo_level() == 0) { + if (_control_out && route != _control_out && _control_out && _control_out->solo_level() == 0) { _control_out->mod_solo_level (1); } -- 2.30.2