mirror of
https://github.com/microtherion/VocalEasel.git
synced 2024-12-22 11:14:00 +00:00
Fix copy & paste of repeats
This commit is contained in:
parent
e7aa36e25e
commit
58dbd3992b
|
@ -1849,13 +1849,13 @@ VLSong VLSong::CopyMeasures(size_t beginMeasure, size_t endMeasure)
|
||||||
subSong.fMeasures[i].fPropIdx -= firstProp;
|
subSong.fMeasures[i].fPropIdx -= firstProp;
|
||||||
|
|
||||||
for (size_t r=0; r<fRepeats.size(); ++r) {
|
for (size_t r=0; r<fRepeats.size(); ++r) {
|
||||||
VLRepeat & rp = fRepeats[r];
|
VLRepeat rp = fRepeats[r];
|
||||||
if (rp.fEndings[0].fBegin >= beginMeasure
|
if (rp.fEndings[0].fBegin >= beginMeasure
|
||||||
&& rp.fEndings[0].fEnd <= endMeasure
|
&& rp.fEndings[0].fEnd <= endMeasure
|
||||||
) {
|
) {
|
||||||
for (size_t e=0; e<rp.fEndings.size(); ++e) {
|
for (size_t e=0; e<rp.fEndings.size(); ++e) {
|
||||||
rp.fEndings[e].fBegin -= beginMeasure;
|
rp.fEndings[e].fBegin -= beginMeasure;
|
||||||
rp.fEndings[e].fEnd -= endMeasure;
|
rp.fEndings[e].fEnd -= beginMeasure;
|
||||||
}
|
}
|
||||||
subSong.fRepeats.push_back(rp);
|
subSong.fRepeats.push_back(rp);
|
||||||
}
|
}
|
||||||
|
@ -1993,7 +1993,7 @@ void VLSong::DeleteMeasures(size_t beginMeasure, size_t endMeasure, int mode)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
// Keep an empty meausure at the end
|
// Keep an empty measure at the end
|
||||||
//
|
//
|
||||||
if (!EmptyEnding())
|
if (!EmptyEnding())
|
||||||
AddMeasure();
|
AddMeasure();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user