ardour/livetrax
13
0
Fork 0
Code

further tweaks to session close

Browse Source
This commit is contained in:
Robin Gareus 2016-04-24 02:51:23 +02:00
parent f317451609
commit 4fe7d1ea08
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/session.cc
View File

@ -596,6 +596,7 @@ Session::destroy ()
/* disconnect from any and all signals that we are connected to */ /* disconnect from any and all signals that we are connected to */
Port::PortSignalDrop (); /* EMIT SIGNAL */
drop_connections (); drop_connections ();
/* shutdown control surface protocols while we still have ports /* shutdown control surface protocols while we still have ports
@ -616,7 +617,6 @@ Session::destroy ()
* callbacks from the engine any more. * callbacks from the engine any more.
*/ */
Port::PortSignalDrop (); /* EMIT SIGNAL */
Port::PortDrop (); /* EMIT SIGNAL */ Port::PortDrop (); /* EMIT SIGNAL */
ltc_tx_cleanup(); ltc_tx_cleanup();
@ -1077,11 +1077,16 @@ Session::remove_monitor_section ()
} }
remove_route (_monitor_out); remove_route (_monitor_out);
if (_state_of_the_state & Deletion) {
return;
}
auto_connect_master_bus (); auto_connect_master_bus ();
if (auditioner) { if (auditioner) {
auditioner->connect (); auditioner->connect ();
} }
Config->ParameterChanged ("use-monitor-bus"); Config->ParameterChanged ("use-monitor-bus");
} }
@ -3557,7 +3562,7 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
resort_routes (); resort_routes ();
#endif #endif
if (_process_graph) { if (_process_graph && !(_state_of_the_state & Deletion)) {
_process_graph->clear_other_chain (); _process_graph->clear_other_chain ();
} }
@ -3574,6 +3579,10 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
(*iter)->drop_references (); (*iter)->drop_references ();
} }
if (_state_of_the_state & Deletion) {
return;
}
Route::RemoteControlIDChange(); /* EMIT SIGNAL */ Route::RemoteControlIDChange(); /* EMIT SIGNAL */
/* save the new state of the world */ /* save the new state of the world */