From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Sat, 30 Jan 2010 14:34:37 +0000 (+0000)
Subject: Fix failure in dvd wizard
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=aa2b7c6a644d3272c58316112d6af19d34263a07;p=kdenlive

Fix failure in dvd wizard

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

diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp
index a4543972..850ea3de 100644
--- a/src/dvdwizard.cpp
+++ b/src/dvdwizard.cpp
@@ -116,6 +116,7 @@ DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent
 DvdWizard::~DvdWizard()
 {
     m_authorFile.remove();
+    m_menuFile.remove();
     blockSignals(true);
     delete m_burnMenu;
     if (m_dvdauthor) {
@@ -182,9 +183,10 @@ void DvdWizard::generateDvd()
     //temp6.setAutoRemove(false);
     temp6.open();
 
-    KTemporaryFile menuFile;
-    menuFile.setSuffix(".mpg");
-    menuFile.open();
+    m_menuFile.close();
+    m_menuFile.setSuffix(".mpg");
+    m_menuFile.setAutoRemove(false);
+    m_menuFile.open();
 
     m_authorFile.close();
     m_authorFile.setSuffix(".xml");
@@ -310,13 +312,13 @@ void DvdWizard::generateDvd()
 
         QStringList args;
         args.append(temp6.fileName());
-        kDebug() << "SPM ARGS: " << args << temp5.fileName() << menuFile.fileName();
+        kDebug() << "SPM ARGS: " << args << temp5.fileName() << m_menuFile.fileName();
 
         QProcess spumux;
 
         if (m_pageMenu->menuMovie()) spumux.setStandardInputFile(m_pageMenu->menuMoviePath());
         else spumux.setStandardInputFile(temp5.fileName());
-        spumux.setStandardOutputFile(menuFile.fileName());
+        spumux.setStandardOutputFile(m_menuFile.fileName());
         spumux.start("spumux", args);
         if (spumux.waitForFinished()) {
             m_status.error_log->append(spumux.readAllStandardError());
@@ -338,7 +340,7 @@ void DvdWizard::generateDvd()
         }
 
         spuitem->setIcon(KIcon("dialog-ok"));
-        kDebug() << "/// DONE: " << menuFile.fileName();
+        kDebug() << "/// DONE: " << m_menuFile.fileName();
     }
 
     // create dvdauthor xml
@@ -392,7 +394,7 @@ void DvdWizard::generateDvd()
             pgc.appendChild(button);
         }
         QDomElement menuvob = dvddoc.createElement("vob");
-        menuvob.setAttribute("file", menuFile.fileName());
+        menuvob.setAttribute("file", m_menuFile.fileName());
         menuvob.setAttribute("pause", "inf");
         pgc.appendChild(menuvob);
     }
diff --git a/src/dvdwizard.h b/src/dvdwizard.h
index 367324dc..b4b479d4 100644
--- a/src/dvdwizard.h
+++ b/src/dvdwizard.h
@@ -50,6 +50,7 @@ private:
     Ui::DvdWizardStatus_UI m_status;
     DvdWizardChapters *m_pageChapters;
     KTemporaryFile m_authorFile;
+    KTemporaryFile m_menuFile;
     QProcess *m_dvdauthor;
     QProcess *m_mkiso;
     QString m_creationLog;