LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix begin() iterator decrement

Browse source
This commit is contained in:
Andrey M. Tokarev 2013-07-25 02:22:43 +04:00
parent 2a3fe4584c
commit 81444c06d3
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mscore/importmidi_tuplet.cpp
View file

@ -515,11 +515,13 @@ void minimizeOffTimeError(std::vector<TupletInfo> &tuplets,
std::multimap<Fraction, MidiChord> &chords,
int nonTupletVoice)
{
for (auto it = tuplets.begin(); it != tuplets.end(); ++it) {
for (auto it = tuplets.begin(); it != tuplets.end(); ) {
TupletInfo &tupletInfo = *it;
auto firstChord = tupletInfo.chords.begin();
if (firstChord == tupletInfo.chords.end() || firstChord->first != 0)
if (firstChord == tupletInfo.chords.end() || firstChord->first != 0) {
++it;
continue;
}
auto &notes = firstChord->second->second.notes;
const Fraction &onTime = firstChord->second->first;
std::vector<int> removedIndexes;
@ -579,11 +581,11 @@ void minimizeOffTimeError(std::vector<TupletInfo> &tuplets,
tupletInfo.chords.erase(0); // erase first (index 0) empty chord in tuplet
if (tupletInfo.chords.empty()) {
it = tuplets.erase(it); // remove tuplet without chords
--it;
continue;
}
}
}
++it;
}
}