summaryrefslogtreecommitdiff
path: root/gtk2_ardour/route_ui.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-12-25 21:06:52 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-12-25 21:06:52 +0000
commitb6f4cdaea27fbf49f924b2684d4c638089314067 (patch)
tree4328e93333d13eccadc18455ba32a7293d3cbd73 /gtk2_ardour/route_ui.cc
parentf53cbaede885cd52b8fee59890e33575a4fc11fa (diff)
rationalize destruction pathway (some more); tidy-ify some ImageFrame code
git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
-rw-r--r--gtk2_ardour/route_ui.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index f78885deb4..e3ee563ac7 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -79,6 +79,9 @@ RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session* sess)
RouteUI::~RouteUI()
{
+ _route.reset (); /* drop reference to route, so that it can be cleaned up */
+ route_connections.drop_connections ();
+
delete solo_menu;
delete mute_menu;
delete sends_menu;
@@ -165,9 +168,6 @@ RouteUI::self_delete ()
{
/* This may be called from a non-GUI thread. Keep it safe */
- cerr << "\n\nExpect to see route " << _route->name() << " be deleted\n";
- _route.reset (); /* drop reference to route, so that it can be cleaned up */
- route_connections.drop_connections ();
delete_when_idle (this);
}