ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix 0006183 (waveview crash).

Browse Source 
Should fix crash when audiosource disappears.
Reworked from submitted patch from tlat.
This commit is contained in:
nick_m 2015-03-24 23:35:43 +11:00
parent 5bbea60546
commit eff25b06f5
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/canvas/wave_view.cc
View File

@ -211,6 +211,21 @@ WaveView::invalidate_image_cache ()
vector <uint32_t> deletion_list;
vector <CacheEntry> caches;
/* The source may have disappeared in the case of rec regions.*/
if (_region->n_channels() == 0) {
std::map <boost::shared_ptr<ARDOUR::AudioSource>, std::vector <CacheEntry> >::iterator i;
for (i = _image_cache.begin(); i != _image_cache.end(); ++i) {
if (i->first.unique()) {
for (uint32_t n = 0; n < (*i).second.size (); ++n) {
(*i).second[n].image.clear ();
}
(*i).second.clear ();
_image_cache.erase(i->first);
}
}
return;
}
if (_image_cache.find (_region->audio_source ()) != _image_cache.end ()) {
caches = _image_cache.find (_region->audio_source ())->second;
} else {
@ -228,7 +243,6 @@ WaveView::invalidate_image_cache ()
}
deletion_list.push_back (i);
}
while (deletion_list.size() > 0) {
@ -242,7 +256,6 @@ WaveView::invalidate_image_cache ()
} else {
_image_cache[_region->audio_source ()] = caches;
}
}
void