Merge branch 'master' into cairocanvas

1 files changed, 14 insertions, 0 deletions

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index b880883e09..d93d689459 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -805,6 +805,12 @@ Session::remove_monitor_section ()
 	/* force reversion to Solo-In-Place */
 	Config->set_solo_control_is_listen_control (false);
 
+	/* if we are auditioning, cancel it ... this is a workaround
+	   to a problem (auditioning does not execute the process graph,
+	   which is needed to remove routes when using >1 core for processing)
+	*/
+	cancel_audition ();
+
 	{
 		/* Hold process lock while doing this so that we don't hear bits and
 		 * pieces of audio as we work on each route.
@@ -835,6 +841,10 @@ Session::remove_monitor_section ()
 
 	remove_route (_monitor_out);
 	auto_connect_master_bus ();
+
+	if (auditioner) {
+		auditioner->connect ();
+	}
 }
 
 void
@@ -979,6 +989,10 @@ Session::add_monitor_section ()
 			(*x)->enable_monitor_send ();
 		}
 	}
+
+	if (auditioner) {
+		auditioner->connect ();
+	}
 }
 
 void