microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2024-12-22 19:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of empty songs

Browse Source
This commit is contained in:
Matthias Neeracher 2011-08-26 17:26:24 +00:00
parent 4a5e1574ca
commit 83194fc368
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/VLModel.cpp
View File

@ -2288,6 +2288,8 @@ void VLSongVisitor::VisitMeasures(VLSong & song, bool performanceOrder)
} }
} else { } else {
size_t e = song.CountMeasures() - song.EmptyEnding(); size_t e = song.CountMeasures() - song.EmptyEnding();
if (!e && song.CountMeasures())
e = 1;
for (size_t m=0; m!=e; ++m) { for (size_t m=0; m!=e; ++m) {
VLMeasure & meas = song.fMeasures[m]; VLMeasure & meas = song.fMeasures[m];

5
Sources/VLPListDocument.mm
View File

@ -491,6 +491,11 @@ advanceAt:
[self readMeasuresFromPlist:[plist objectForKey:@"measures"]]; [self readMeasuresFromPlist:[plist objectForKey:@"measures"]];
[undoMgr enableUndoRegistration]; [undoMgr enableUndoRegistration];
if (song->fMeasures.empty()) {
delete song;
song = new VLSong(true);
}
return YES; return YES;
} }