summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-10-26 15:14:53 +0000
committerCarl Hetherington <carl@carlh.net>2011-10-26 15:14:53 +0000
commit8326ba90661a761e614cedcacefe038d81f9f37f (patch)
tree102be500fb4d66c256b104b66cc4c46270962765 /libs
parentebca0ae87d381638ddb36224143ec2be3d701ef9 (diff)
Don't resort routes at every step during a session's
construction; speeds up loading of big sessions. git-svn-id: svn://localhost/ardour2/branches/3.0@10308 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/session.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index b0dde9b752..5ac2446d03 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1327,10 +1327,11 @@ void
Session::resort_routes ()
{
/* don't do anything here with signals emitted
- by Routes while we are being destroyed.
+ by Routes during initial setup or while we
+ are being destroyed.
*/
- if (_state_of_the_state & Deletion) {
+ if (_state_of_the_state & (InitialConnecting | Deletion)) {
return;
}