[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] staging/kio/src/core: fix more crashes when kiowidgets isn't used (no delegate
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2013-08-28 16:01:57
Message-ID: E1VEiBx-0002cK-EB () scm ! kde ! org
[Download RAW message or body]

Git commit 74d3e884bfdde2aa2d053d7e6302140ea37b140e by Martin Klapetek.
Committed on 28/08/2013 at 16:01.
Pushed by mklapetek into branch 'frameworks'.

fix more crashes when kiowidgets isn't used (no delegate extension)

M  +9    -3    staging/kio/src/core/copyjob.cpp

http://commits.kde.org/kdelibs/74d3e884bfdde2aa2d053d7e6302140ea37b140e

diff --git a/staging/kio/src/core/copyjob.cpp b/staging/kio/src/core/copyjob.cpp
index b332c31..794efa1 100644
--- a/staging/kio/src/core/copyjob.cpp
+++ b/staging/kio/src/core/copyjob.cpp
@@ -2161,7 +2161,9 @@ CopyJob *KIO::move(const QUrl& src, const QUrl& dest, JobFlags flags)
     QList<QUrl> srcList;
     srcList.append( src );
     CopyJob* job = CopyJobPrivate::newJob(srcList, dest, CopyJob::Move, false, flags);
-    job->uiDelegateExtension()->createClipboardUpdater(job, JobUiDelegateExtension::UpdateContent);
+    if (job->uiDelegateExtension()) {
+        job->uiDelegateExtension()->createClipboardUpdater(job, JobUiDelegateExtension::UpdateContent);
+    }
     return job;
 }
 
@@ -2171,7 +2173,9 @@ CopyJob *KIO::moveAs(const QUrl& src, const QUrl& dest, JobFlags flags)
     QList<QUrl> srcList;
     srcList.append( src );
     CopyJob* job = CopyJobPrivate::newJob(srcList, dest, CopyJob::Move, true, flags);
-    job->uiDelegateExtension()->createClipboardUpdater(job, JobUiDelegateExtension::UpdateContent);
+    if (job->uiDelegateExtension()) {
+        job->uiDelegateExtension()->createClipboardUpdater(job, JobUiDelegateExtension::UpdateContent);
+    }
     return job;
 }
 
@@ -2179,7 +2183,9 @@ CopyJob *KIO::move( const QList<QUrl>& src, const QUrl& dest, JobFlags flags)
 {
     //qDebug() << src << dest;
     CopyJob* job = CopyJobPrivate::newJob(src, dest, CopyJob::Move, false, flags);
-    job->uiDelegateExtension()->createClipboardUpdater(job, JobUiDelegateExtension::UpdateContent);
+    if (job->uiDelegateExtension()) {
+        job->uiDelegateExtension()->createClipboardUpdater(job, JobUiDelegateExtension::UpdateContent);
+    }
     return job;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]