allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Don’t use invalid iterator during cleanup. fixes #6403

Browse Source
This commit is contained in:
Robin Gareus
2015-07-02 19:46:38 +02:00
parent 466af2a80b
commit 9e2048decf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/session_state.cc
View File

@@ -2888,6 +2888,8 @@ Session::cleanup_sources (CleanupReport& rep)
in the region list. in the region list.
*/ */
std::string fpath = i->second->name ();
RegionFactory::remove_regions_using_source (i->second); RegionFactory::remove_regions_using_source (i->second);
sources.erase (i); sources.erase (i);
@@ -2895,7 +2897,7 @@ Session::cleanup_sources (CleanupReport& rep)
for (set<string>::iterator j = all_sources.begin(); j != all_sources.end(); ++j) { for (set<string>::iterator j = all_sources.begin(); j != all_sources.end(); ++j) {
spath = Glib::path_get_basename (*j); spath = Glib::path_get_basename (*j);
if ( spath == i->second->name () ) { if ( spath == fpath ) {
all_sources.erase (j); all_sources.erase (j);
break; break;
} }