diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 5be432f5b..fa1a4ef7d 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -1948,7 +1948,10 @@ void MainWindow::Clear() qCDebug(vMainWindow, "Returned to Draw mode."); pattern->Clear(); qCDebug(vMainWindow, "Clearing pattern."); - watcher->removePath(AbsoluteMPath(curFile, doc->MPath())); + if (not curFile.isEmpty()) + { + watcher->removePath(AbsoluteMPath(curFile, doc->MPath())); + } doc->clear(); setCurrentFile(QString()); qCDebug(vMainWindow, "Clearing scenes."); diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 775553761..3e1a16f48 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -222,7 +222,7 @@ void VPatternConverter::TagUnitToV0_2_0() unit.appendChild(newNodeText); QDomElement patternElement = documentElement(); - patternElement.insertAfter(unit, patternElement.firstChild()); + patternElement.insertAfter(unit, patternElement.firstChildElement("version")); } //--------------------------------------------------------------------------------------------------------------------- @@ -239,8 +239,8 @@ void VPatternConverter::TagIncrementToV0_2_0() QSet VPatternConverter::FixIncrementsToV0_2_0() { QSet names; - const QDomElement ms = TagMeasurementsV0_1_4(); - QDomNode domNode = ms.firstChild(); + const QDomElement incr = TagIncrementsV0_1_4(); + QDomNode domNode = incr.firstChild(); while (domNode.isNull() == false) { if (domNode.isElement()) @@ -502,6 +502,19 @@ QDomElement VPatternConverter::TagMeasurementsV0_1_4() const return element; } +//--------------------------------------------------------------------------------------------------------------------- +QDomElement VPatternConverter::TagIncrementsV0_1_4() const +{ + const QDomNodeList list = elementsByTagName("increments"); + const QDomElement element = list.at(0).toElement(); + if (not element.isElement()) + { + VException excep("Can't get tag measurements."); + throw excep; + } + return element; +} + //--------------------------------------------------------------------------------------------------------------------- QStringList VPatternConverter::ListPathPointExpressionsV0_1_4() const { diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 51e4e630c..e636e0513 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -73,6 +73,7 @@ private: QString MUnitV0_1_4() const; QDomElement TagMeasurementsV0_1_4() const; + QDomElement TagIncrementsV0_1_4() const; QStringList ListPathPointExpressionsV0_1_4() const; };