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

List:       kde-commits
Subject:    [kdepim/Applications/16.04] kmail: Fix Bug 358679 - kmail5 crash on reload when config to empty tras
From:       Montel Laurent <montel () kde ! org>
Date:       2016-06-30 18:42:48
Message-ID: E1bIgvI-0003Im-Ev () code ! kde ! org
[Download RAW message or body]

Git commit 544f8cd337d7179cf51cd908f012431243760ad1 by Montel Laurent.
Committed on 30/06/2016 at 18:42.
Pushed by mlaurent into branch 'Applications/16.04'.

Fix Bug 358679 - kmail5 crash on reload when config to empty trash on exit

FIXED-IN: 5.2.3
BUG: 358679

M  +1    -6    kmail/kmkernel.cpp

http://commits.kde.org/kdepim/544f8cd337d7179cf51cd908f012431243760ad1

diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index cc4a35a..cc7325b 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -1413,12 +1413,7 @@ void KMKernel::cleanup(void)
     Akonadi::Collection trashCollection = CommonKernel->trashCollectionFolder();
     if (trashCollection.isValid()) {
         if (KMailSettings::self()->emptyTrashOnExit()) {
-            Akonadi::CollectionStatisticsJob *jobStatistics = new \
                Akonadi::CollectionStatisticsJob(trashCollection);
-            if (jobStatistics->exec()) {
-                if (jobStatistics->statistics().count() > 0) {
-                    mFolderCollectionMonitor->expunge(trashCollection, true \
                /*sync*/);
-                }
-            }
+            mFolderCollectionMonitor->expunge(trashCollection, true /*sync*/);
         }
     }
     delete mConfigureDialog;


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