fix a huge mess with sends, involving incorrect GUI cleanup, an unhandled exception and as a result, bad reference counting of sends leading to ports never going away because the send was never deleted

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3484 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 13 insertions, 1 deletions

diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index e99d74e2f0..037123d169 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -496,7 +496,12 @@ RedirectBox::choose_send ()
 
 	/* XXX need redirect lock on route */
 
-	send->ensure_io (0, _route->max_redirect_outs(), false, this);
+	try {
+		send->ensure_io (0, _route->max_redirect_outs(), false, this);
+	} catch (AudioEngine::PortRegistrationFailure& err) {
+		error << string_compose (_("Cannot set up new send: %1"), err.what()) << endmsg;
+		return;
+	}
 	
 	IOSelectorWindow *ios = new IOSelectorWindow (_session, send, false, true);
 	
@@ -854,6 +859,13 @@ RedirectBox::idle_delete_redirect (boost::weak_ptr<Redirect> weak_redirect)
 	/* NOT copied to _mixer.selection() */
 
 	no_redirect_redisplay = true;
+
+	void* gui = redirect->get_gui ();
+	
+	if (gui) {
+		static_cast<Gtk::Widget*>(gui)->hide ();
+	}
+	
 	_route->remove_redirect (redirect, this);
 	no_redirect_redisplay = false;
 	redisplay_redirects (this);