summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-07-02 14:15:11 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2015-07-02 14:15:11 -0400
commitb8b5d0b4c7c993fe69a4a3e9cf316856922f6334 (patch)
treec4bf6970f7dd44dbe4d4fad2d41ce4d3c95af4bf
parentaaab1924367ea60d7332d96c2361422bea105f6d (diff)
alternative fix for the same problem that 9e2048decf7c567 was addressing
-rw-r--r--libs/ardour/session_state.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 6dc5462d58..0edff32535 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -2888,20 +2888,19 @@ Session::cleanup_sources (CleanupReport& rep)
in the region list.
*/
- std::string fpath = i->second->name ();
-
RegionFactory::remove_regions_using_source (i->second);
- sources.erase (i);
// also remove source from all_sources
for (set<string>::iterator j = all_sources.begin(); j != all_sources.end(); ++j) {
spath = Glib::path_get_basename (*j);
- if ( spath == fpath ) {
+ if (spath == i->second->name()) {
all_sources.erase (j);
break;
}
}
+
+ sources.erase (i);
}
}
}