Don't resort routes at every step during a session's
authorCarl Hetherington <carl@carlh.net>
Wed, 26 Oct 2011 15:14:53 +0000 (15:14 +0000)
committerCarl Hetherington <carl@carlh.net>
Wed, 26 Oct 2011 15:14:53 +0000 (15:14 +0000)
construction; speeds up loading of big sessions.

git-svn-id: svn://localhost/ardour2/branches/3.0@10308 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/session.cc

index b0dde9b752715942e8013c6b9bc25e71eaae6b58..5ac2446d03cb55578ba57cd0ceaae2e30b52e9c2 100644 (file)
@@ -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;
        }