Merge pull request #3478 from Jojo-Schmitz/album-2.2

Fix #105646: Create album of continuous-view scores crashes
musescore · Feb 19, 2018 · f11cf6e · f11cf6e
2 parents 3da85f4 + 20105a9
commit f11cf6e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/mscore/album.cpp b/mscore/album.cpp
@@ -161,9 +161,12 @@ bool Album::createScore(const QString& fn, bool addPageBreak, bool addSectionBre
 
       Score* score = firstScore->clone();
 
+      LayoutMode layoutMode = score->layoutMode();
+      score->switchToPageMode();
+
       int excerptCount = firstScore->excerpts().count();
       bool joinExcerpt = true;
-	for (AlbumItem* item : _scores) {
+      for (AlbumItem* item : _scores) {
             if (item->score == 0 || item->score == firstScore)
                   continue;
             if (item->score->excerpts().count() != excerptCount) {
@@ -183,6 +186,7 @@ bool Album::createScore(const QString& fn, bool addPageBreak, bool addSectionBre
                   continue;
 
             // try to append root score
+            item->score->ScoreElement::undoChangeProperty(P_ID::LAYOUT_MODE, int(LayoutMode::PAGE));
             item->score->doLayout();
             if (!score->appendScore(item->score, addPageBreak, addSectionBreak)) {
                   qDebug("Cannot append root score of album item \"%s\".", qPrintable(item->name));
@@ -212,6 +216,8 @@ bool Album::createScore(const QString& fn, bool addPageBreak, bool addSectionBre
                   }
             }
 
+      if (layoutMode != score->layoutMode())
+            score->endCmd(true);       // rollback
       score->fileInfo()->setFile(fn);
       qDebug("Album::createScore: save file");
       try {