summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2014-09-10 20:43:30 +0200
committerRobin Gareus <robin@gareus.org>2014-09-10 20:43:30 +0200
commitf6766d4a2f198614e8272c02aa16fe1957c7702f (patch)
tree73a8b15d7e5ec0417cdb5f7e34692ac05b961067
parentcadbf191da3fd8b2c3083254a958a1a35eb031d1 (diff)
delete route-groups before flushing routes.
-rw-r--r--libs/ardour/session.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 919b4be28c..fe7fad675f 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -492,6 +492,11 @@ Session::destroy ()
delete midi_control_ui;
delete _all_route_group;
+ DEBUG_TRACE (DEBUG::Destruction, "delete route groups\n");
+ for (list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) {
+ delete *i;
+ }
+
if (click_data != default_click) {
delete [] click_data;
}
@@ -557,12 +562,6 @@ Session::destroy ()
sources.clear ();
}
- DEBUG_TRACE (DEBUG::Destruction, "delete route groups\n");
- for (list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) {
-
- delete *i;
- }
-
/* not strictly necessary, but doing it here allows the shared_ptr debugging to work */
playlists.reset ();