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

List:       kde-commits
Subject:    [kdepim/KDE/4.11] korganizer: Don't delete the filter twice.
From:       Sergio Martins <iamsergio () gmail ! com>
Date:       2013-11-08 9:58:41
Message-ID: E1Veipt-0002yH-5u () scm ! kde ! org
[Download RAW message or body]

Git commit 1a21d9535b7873db41bd6a2496c654e7b6addc88 by Sergio Martins.
Committed on 08/11/2013 at 09:56.
Pushed by smartins into branch 'KDE/4.11'.

Don't delete the filter twice.

Fixes crash at exit that wasn't reproducible before because
the calendar was leaked.

BUG: 327262
FIXED-IN: 4.11.4

M  +2    -1    korganizer/calendarview.cpp

http://commits.kde.org/kdepim/1a21d9535b7873db41bd6a2496c654e7b6addc88

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 6b14c5a..8389e9f 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -292,9 +292,10 @@ CalendarView::CalendarView( QWidget *parent ) : Calend=
arViewBase( parent ),
 CalendarView::~CalendarView()
 {
   mCalendar->unregisterObserver( this );
+  mCalendar->setFilter( 0 ); // So calendar doesn't deleted it twice
   qDeleteAll( mFilters );
   qDeleteAll( mExtensions );
-//
+
   delete mDialogManager;
   delete mViewManager;
   delete mEventViewer;
[prev in list] [next in list] [prev in thread] [next in thread]