Cleanup stub files after setup_raid_path has prepared the paths for it to use.
authorCarl Hetherington <carl@carlh.net>
Tue, 1 Mar 2011 15:05:55 +0000 (15:05 +0000)
committerCarl Hetherington <carl@carlh.net>
Tue, 1 Mar 2011 15:05:55 +0000 (15:05 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@9002 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/session_state.cc

index dc25e64bfbb51db4fb8eeea3fb34906b21c1e779..5333c9165ccb6f51a1273439a3fd7de936f4ed56 100644 (file)
@@ -299,7 +299,6 @@ Session::second_stage_init ()
                if (load_state (_current_snapshot_name)) {
                        return -1;
                }
-                cleanup_stubfiles ();
        }
 
        if (_butler->start_thread()) {
@@ -1236,6 +1235,8 @@ Session::set_state (const XMLNode& node, int version)
 
        setup_raid_path(_session_dir->root_path().to_string());
 
+       cleanup_stubfiles ();
+       
        if ((prop = node.property (X_("id-counter"))) != 0) {
                uint64_t x;
                sscanf (prop->value().c_str(), "%" PRIu64, &x);