From 56c831199ecb9a2ef3c37f5391a34bd98e93f533 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 6 Jun 2016 19:22:33 -0400
Subject: [PATCH] drop reference to VCA from VCAMasterStrip immediately rather
 than waiting for idle

---
 gtk2_ardour/vca_master_strip.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc
index be6f862a7c..4c4d739859 100644
--- a/gtk2_ardour/vca_master_strip.cc
+++ b/gtk2_ardour/vca_master_strip.cc
@@ -187,6 +187,12 @@ VCAMasterStrip::~VCAMasterStrip ()
 void
 VCAMasterStrip::self_delete ()
 {
+	if ((_session && !_session->deletion_in_progress()) && Mixer_UI::instance()->showing_vca_slaves_for (_vca)) {
+		/* cancel spill for this VCA */
+		Mixer_UI::instance()->show_vca_slaves (boost::shared_ptr<VCA>());
+	}
+	/* Drop reference immediately, delete self when idle */
+	_vca.reset ();
 	delete_when_idle (this);
 }