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

List:       kde-commits
Subject:    KDE/kdepim/kmail/messagelistview/core
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2008-12-09 21:53:59
Message-ID: 1228859639.867436.15274.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 895052 by smartins:

Zero out mApplyThemeColumnsTimer so Model will not cause accesses to it in its \
destruction process. Fixes kontact/kmail crashing on  exit.


 M  +8 -2      view.cpp  


--- trunk/KDE/kdepim/kmail/messagelistview/core/view.cpp #895051:895052
@@ -103,7 +103,7 @@
 }
 
 View::~View()
-{
+{ 
   if ( mSaveThemeColumnStateTimer->isActive() )
     mSaveThemeColumnStateTimer->stop();
   delete mSaveThemeColumnStateTimer;
@@ -111,7 +111,9 @@
     mApplyThemeColumnsTimer->stop();
   delete mApplyThemeColumnsTimer;
 
-  // Zero out the theme and aggregation, so Model will not cause accesses to them in \
its destruction process +  // Zero out the theme, aggregation and \
ApplyThemeColumnsTimer so Model will not cause accesses to them in its destruction \
process +  mApplyThemeColumnsTimer = 0;
+  
   mTheme = 0;
   mAggregation = 0;
 }
@@ -214,6 +216,10 @@
 
 void View::applyThemeColumns()
 {
+  if ( !mApplyThemeColumnsTimer ) {
+    return;
+  }
+
   if ( mApplyThemeColumnsTimer->isActive() )
     mApplyThemeColumnsTimer->stop();
  


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