From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Thu, 18 Jun 2009 12:42:03 +0000 (+0000)
Subject: Fix guides & groups not correctly restored when opening a file:
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d82d4bd756b93f81af94edbeb33f74e74016c650;p=kdenlive

Fix guides & groups not correctly restored when opening a file:
http://kdenlive.org/mantis/view.php?id=929

svn path=/trunk/kdenlive/; revision=3573
---

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index 9f357fe1..34286682 100644
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -191,7 +191,6 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup
                                 infoXml.removeChild(markers);
                             }
                             setProfilePath(profileName);
-                            mlt.removeChild(infoXml);
                             kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count();
                         }
                     }
diff --git a/src/trackview.cpp b/src/trackview.cpp
index fc211526..1316483d 100644
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -343,9 +343,14 @@ void TrackView::parseDocument(QDomDocument doc)
     // Rebuild groups
     QDomNodeList groups = doc.elementsByTagName("group");
     m_trackview->loadGroups(groups);
-
     m_trackview->setDuration(duration);
     kDebug() << "///////////  TOTAL PROJECT DURATION: " << duration;
+    
+    // Remove Kdenlive extra info from xml doc before sending it to MLT
+    QDomElement mlt = doc.firstChildElement("mlt");
+    QDomElement infoXml = mlt.firstChildElement("kdenlivedoc");
+    mlt.removeChild(infoXml);
+    
     slotRebuildTrackHeaders();
     if (!m_documentErrors.isNull()) KMessageBox::sorry(this, m_documentErrors);
     //m_trackview->setCursorPos(cursorPos);