From 10c313e92dd181422b684852f1501f1b7e647810 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Tue, 24 Jul 2012 12:33:52 +0200
Subject: [PATCH] Avoid crash - check if dialog pointer is still valid

---
 src/customtrackview.cpp | 2 +-
 src/mainwindow.cpp      | 2 +-
 src/monitor.cpp         | 3 ++-
 src/titlewidget.cpp     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 82931894..4c752319 100644
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1406,8 +1406,8 @@ void CustomTrackView::editItemDuration()
                 updateTrackDuration(clipInfo.track, moveCommand);
                 m_commandStack->push(moveCommand);
             }
-        delete d;
         }
+        delete d;
     } else {
         emit displayMessage(i18n("Item is locked"), ErrorMessage);
     }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ba8e828e..2712972c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3758,7 +3758,7 @@ int MainWindow::getNewStuff(const QString &configFile)
 #if KDE_IS_VERSION(4,3,80)
     QPointer<KNS3::DownloadDialog> dialog = new KNS3::DownloadDialog(configFile);
     dialog->exec();
-    entries = dialog->changedEntries();
+    if (dialog) entries = dialog->changedEntries();
     foreach(const KNS3::Entry & entry, entries) {
         if (entry.status() == KNS3::Entry::Installed)
             kDebug() << "// Installed files: " << entry.installedFiles();
diff --git a/src/monitor.cpp b/src/monitor.cpp
index 2effe24a..34eb1de5 100644
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -583,7 +583,8 @@ void Monitor::slotExtractCurrentFrame()
     fs->setConfirmOverwrite(true);
     fs->setKeepLocation(true);
     fs->exec();
-    QString path = fs->selectedFile();
+    QString path;
+    if (fs) path = fs->selectedFile();
     delete fs;
     if (!path.isEmpty()) {
         frame.save(path);
diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index d25b8602..034e98e7 100644
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -1853,7 +1853,7 @@ void TitleWidget::saveTitle(KUrl url)
         fs->setConfirmOverwrite(true);
         fs->setKeepLocation(true);
         fs->exec();
-        url = fs->selectedUrl();
+        if (fs) url = fs->selectedUrl();
         delete fs;
     }
     if (!url.isEmpty()) {
-- 
2.39.2