ardour/livetrax
13
0
Fork 0
Code

fix iterator after map::erase().

Browse Source 
The iterator referring to the removed element is invalidated.
Other iterators remain valid.
This commit is contained in:
Robin Gareus 2015-09-23 22:23:43 +02:00
parent ccf558f482
commit fedec84d3b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/ardour/session_state.cc
View File

@ -2817,25 +2817,34 @@ Session::cleanup_regions ()
bool removed = false;
const RegionFactory::RegionMap& regions (RegionFactory::regions());
for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) {
for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end();) {
uint32_t used = playlists->region_use_count (i->second);
if (used == 0 && !i->second->automatic ()) {
boost::weak_ptr<Region> w = i->second;
++i;
removed = true;
RegionFactory::map_remove (i->second);
RegionFactory::map_remove (w);
} else {
++i;
}
}
if (removed) {
// re-check to remove parent references of compound regions
for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) {
for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end();) {
if (!(i->second->whole_file() && i->second->max_source_level() > 0)) {
++i;
continue;
}
assert(boost::dynamic_pointer_cast<PlaylistSource>(i->second->source (0)) != 0);
if (0 == playlists->region_use_count (i->second)) {
RegionFactory::map_remove (i->second);
boost::weak_ptr<Region> w = i->second;
++i;
RegionFactory::map_remove (w);
} else {
++i;
}
}
}