Remove manually deleted subpresentations from .uia

Task-number: QT3DS-2431
Change-Id: I3ff69e04a4099988577161a59bf22d9f3c0bafd0
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>

1 files changed, 16 insertions, 3 deletions

diff --git a/src/Authoring/Qt3DStudio/Application/ProjectFile.cpp b/src/Authoring/Qt3DStudio/Application/ProjectFile.cpp
index b4c18c50..d7c21a95 100644
--- a/src/Authoring/Qt3DStudio/Application/ProjectFile.cpp
+++ b/src/Authoring/Qt3DStudio/Application/ProjectFile.cpp
@@ -546,9 +546,11 @@ void ProjectFile::loadSubpresentationsAndDatainputs(
     m_initialPresentation = g_StudioApp.GetCore()->GetDoc()->getPresentationId();
 
     QDomDocument doc;
-    if (!StudioUtils::readFileToDomDocument(getProjectFilePath(), doc))
+    QSaveFile projectFile(getProjectFilePath());
+    if (!StudioUtils::openDomDocumentSave(projectFile, doc))
         return;
 
+    QVector<QDomElement> removedElements;
     QDomElement assetsElem = doc.documentElement().firstChildElement(QStringLiteral("assets"));
     if (!assetsElem.isNull()) {
         QString initial = assetsElem.attribute(QStringLiteral("initial"));
@@ -563,13 +565,24 @@ void ProjectFile::loadSubpresentationsAndDatainputs(
                 QString argsOrSrc = p.attribute(QStringLiteral("src"));
                 if (argsOrSrc.isNull())
                     argsOrSrc = p.attribute(QStringLiteral("args"));
-                subpresentations.push_back(
-                            SubPresentationRecord(p.nodeName(), p.attribute("id"), argsOrSrc));
+                // Skip non-existent presentations (they have been manually deleted)
+                if (QFileInfo().exists(getAbsoluteFilePathTo(argsOrSrc))) {
+                    subpresentations.push_back(
+                                SubPresentationRecord(p.nodeName(), p.attribute("id"), argsOrSrc));
+                } else {
+                    removedElements.append(p);
+                }
             } else {
                 parseDataInputElem(p, datainputs);
             }
         }
     }
+    if (removedElements.size()) {
+        for (auto &elem : qAsConst(removedElements))
+            assetsElem.removeChild(elem);
+        StudioUtils::commitDomDocumentSave(projectFile, doc);
+    }
+
     g_StudioApp.GetCore()->GetDoc()->UpdateDatainputMap();
 }