summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-03-29 13:14:24 +0000
committerJohannes Huber <johu@gentoo.org>2015-03-29 13:14:24 +0000
commitf4821337f22590e5360c9770dcf407f777503999 (patch)
tree4713140b61788ea0a21d0d7a28d1ba4aeb47cf50 /kde-base/kmail/files
parentVersion Bump; drop old (diff)
downloadhistorical-f4821337f22590e5360c9770dcf407f777503999.tar.gz
historical-f4821337f22590e5360c9770dcf407f777503999.tar.bz2
historical-f4821337f22590e5360c9770dcf407f777503999.zip
Version bump KDE PIM 4.14.6
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xF3CFD2BD
Diffstat (limited to 'kde-base/kmail/files')
-rw-r--r--kde-base/kmail/files/kmail-4.14.6-fix-crash.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch b/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch
new file mode 100644
index 000000000000..308d98df82b8
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch
@@ -0,0 +1,21 @@
+commit b6196bc1fd489a5be69731ca9a19d8a95f721570
+Author: Montel Laurent <montel@kde.org>
+Date: Thu Mar 12 07:48:15 2015 +0100
+
+ Fix Bug 345071 - KMail crashed while I was reading an email
+
+ BUG: 345071
+ FIXED-IN: 4.16.7
+
+diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
+index 2228aef..92ba8c5 100644
+--- a/kmail/kmmainwidget.cpp
++++ b/kmail/kmmainwidget.cpp
+@@ -4498,5 +4498,6 @@ void KMMainWidget::populateMessageListStatusFilterCombo()
+
+ void KMMainWidget::slotCollectionRemoved(const Akonadi::Collection &col)
+ {
+- mFavoritesModel->removeCollection(col);
++ if (mFavoritesModel)
++ mFavoritesModel->removeCollection(col);
+ }