Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / dvdwizard.cpp

diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp
index 8d46cb9d61c63f19a6384af5997cb704c3dd8423..4fe1b2962bdae49e200b979f518dc1b029b3ccee 100644 (file)
--- a/src/dvdwizard.cpp
+++ b/src/dvdwizard.cpp
@@ -971,7 +971,7 @@ void DvdWizard::slotLoad()
 
     QString profile = dvdproject.attribute("profile");
     m_pageVob->setProfile(profile);
-
+    m_pageVob->clear();
     m_status.tmp_folder->setUrl(KUrl(dvdproject.attribute("tmp_folder")));
     m_status.iso_image->setUrl(KUrl(dvdproject.attribute("iso_image")));
     QString intro = dvdproject.attribute("intro_movie");
@@ -981,10 +981,9 @@ void DvdWizard::slotLoad()
     }
 
     QDomNodeList vobs = doc.elementsByTagName("vob");
-    m_pageVob->clear();
     for (int i = 0; i < vobs.count(); i++) {
         QDomElement e = vobs.at(i).toElement();
         m_pageVob->slotAddVobFile(KUrl(e.attribute("file")), e.attribute("chapters"));
     }
-    m_pageMenu->loadXml(dvdproject.firstChildElement("menu"));
+    m_pageMenu->loadXml(m_pageVob->dvdFormat(), dvdproject.firstChildElement("menu"));
 }