From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Mon, 23 Jul 2012 07:07:43 +0000 (+0200)
Subject:  newFile: Use QPointer [krazy 21/37] by Mikko Rapeli
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6cb2872bd7daee353e2d1071db7dae22d1d2efe7;p=kdenlive

 newFile: Use QPointer [krazy 21/37] by Mikko Rapeli
---

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c28579ee..b64eba7a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1870,12 +1870,16 @@ void MainWindow::newFile(bool showProjectSettings, bool force)
             if (!closeCurrentDocument())
                 return;
     } else {
-        ProjectSettings *w = new ProjectSettings(NULL, QMap <QString, QString> (), QStringList(), projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, true, this);
-        if (w->exec() != QDialog::Accepted)
+        QPointer<ProjectSettings> w = new ProjectSettings(NULL, QMap <QString, QString> (), QStringList(), projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, true, this);
+        if (w->exec() != QDialog::Accepted) {
+            delete w;
             return;
+        }
         if (!KdenliveSettings::activatetabs())
-            if (!closeCurrentDocument())
+            if (!closeCurrentDocument()) {
+                delete w;
                 return;
+            }
         if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs())
             slotSwitchVideoThumbs();
         if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs())