fix another xml regression (lines)

musescore · Jan 17, 2013 · 58ee008 · 58ee008
1 parent ec449f5
commit 58ee008
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -1580,8 +1580,10 @@ bool Score::processMidiInput()
             _layoutAll = true;
             endCmd();
             //after relayout
-            foreach(MuseScoreView* v, viewer)
-                  v->adjustCanvasPosition(n, false);
+            if (n) {
+                  foreach(MuseScoreView* v, viewer)
+                        v->adjustCanvasPosition(n, false);
+                  }
             return true;
             }
       return false;

diff --git a/libmscore/line.cpp b/libmscore/line.cpp
@@ -59,6 +59,8 @@ bool LineSegment::readProperties(XmlReader& e)
                   setUserOff(QPointF());
                   setReadPos(e.readPoint() * _spatium);
                   }
+            else
+                  e.readNext();
             }
       else if (tag == "pos") {
             QPointF rp = e.readPoint() * spatium();

diff --git a/libmscore/scorefile.cpp b/libmscore/scorefile.cpp
@@ -574,15 +574,13 @@ Score::FileError Score::loadCompressedMsc(QString name, bool ignoreVersionError)
       while (e.readNextStartElement()) {
             const QStringRef& tag(e.name());
 
-printf("read container <%s>\n", tag.toUtf8().data());
             if (tag == "rootfile") {
                   rootfile = e.attribute("full-path");
                   e.skipCurrentElement();
                   }
             else if (tag == "file") {
                   QString image(e.readElementText());
                   QByteArray dbuf = uz.fileData(image);
-printf("read file <%s> %d bytes\n", qPrintable(image), dbuf.size());
                   imageStore.add(image, dbuf);
                   }
             }

diff --git a/libmscore/xml.cpp b/libmscore/xml.cpp
@@ -634,7 +634,7 @@ QString Xml::htmlToString(XmlReader& e)
       QString s;
       if (e.readNextStartElement()) {
             htmlToString(e, 0, &s);
-            printf("====HTML<%s>====\n", qPrintable(s));
+//            printf("====HTML<%s>====\n", qPrintable(s));
             e.skipCurrentElement();
             }
       return s;