From 83ef19bc4508e7834cee70796586eb22b6000fe0 Mon Sep 17 00:00:00 2001 From: Dmitri Ovodok Date: Fri, 23 Nov 2018 11:45:58 +0200 Subject: [PATCH] Fix an infinite loop on barline span handling on 2.X import --- libmscore/read206.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmscore/read206.cpp b/libmscore/read206.cpp index d9327290da..956c3623cf 100644 --- a/libmscore/read206.cpp +++ b/libmscore/read206.cpp @@ -3725,7 +3725,7 @@ Score::FileError MasterScore::read206(XmlReader& e) if (!b) continue; int sp = b->spanStaff(); - if (sp == 0) + if (sp <= 0) continue; for (int span = 1; span <= sp; ++span) { BarLine* nb = toBarLine(s->element((staffIdx + span) * VOICES)); @@ -3742,7 +3742,7 @@ Score::FileError MasterScore::read206(XmlReader& e) for (int staffIdx = 0; staffIdx < nstaves(); ++staffIdx) { Staff* s = staff(staffIdx); int sp = s->barLineSpan(); - if (sp == 0) + if (sp <= 0) continue; for (int span = 1; span <= sp; ++span) { Staff* ns = staff(staffIdx + span);