Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-23 07:40:05 +02:00
Code Issues Releases Wiki Activity

Fix bug when expanding a cutline that contains another cutline...

Browse Source 
... rare case, indeed.
This commit is contained in:
Paul Licameli 2016-09-07 12:50:53 -04:00
parent b56ea0599b
commit 301fa337d5
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/WaveClip.cpp
View File

@ -1683,12 +1683,22 @@ bool WaveClip::ExpandCutLine(double cutLinePosition)
{ {
for (auto it = mCutLines.begin(); it != mCutLines.end(); ++it) for (auto it = mCutLines.begin(); it != mCutLines.end(); ++it)
{ {
const auto &cutline = *it; WaveClip *const cutline = it->get();
if (fabs(mOffset + cutline->GetOffset() - cutLinePosition) < 0.0001) if (fabs(mOffset + cutline->GetOffset() - cutLinePosition) < 0.0001)
{ {
if (!Paste(mOffset+cutline->GetOffset(), cutline.get())) if (!Paste(mOffset+cutline->GetOffset(), cutline))
return false; return false;
mCutLines.erase(it); // deletes cutline! // Now erase the cutline,
// but be careful to find it again, because Paste above may
// have modified the array of cutlines (if our cutline contained
// another cutline!), invalidating the iterator we had.
auto begin = mCutLines.begin(), end = mCutLines.end();
it = std::find_if(begin, end,
[=](const decltype(*begin) &p){ return p.get() == cutline; });
if (it != end)
mCutLines.erase(it); // deletes cutline!
else
wxASSERT(false);
return true; return true;
} }
} }