[gentoo-commits] gentoo-x86 commit in kde-base/kmail/files: kmail-4.14.6-fix-crash.patch

[Johannes Huber (johu)]

johu        15/03/29 13:14:08

  Added:                kmail-4.14.6-fix-crash.patch
  Log:
  Version bump KDE PIM 4.14.6
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)

Revision  Changes    Path
1.1                  kde-base/kmail/files/kmail-4.14.6-fix-crash.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/kmail-4.14.6-fix-crash.patch?rev=1.1&content-type=text/plain

Index: kmail-4.14.6-fix-crash.patch
===================================================================
commit b6196bc1fd489a5be69731ca9a19d8a95f721570
Author: Montel Laurent <montel@×××.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);
 }