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

List:       kde-commits
Subject:    [akonadi-search/Applications/15.08] agent: Fix crash after reinitializing Index
From:       Dan_Vrátil <dvratil () redhat ! com>
Date:       2015-09-22 21:54:29
Message-ID: E1ZeVW9-0003iO-78 () scm ! kde ! org
[Download RAW message or body]

Git commit 5bef6f440afdf9795b7de23fd5ba1ada91d92dc2 by Dan Vrátil.
Committed on 22/09/2015 at 21:52.
Pushed by dvratil into branch 'Applications/15.08'.

Fix crash after reinitializing Index

M  +3    -3    agent/index.cpp

http://commits.kde.org/akonadi-search/5bef6f440afdf9795b7de23fd5ba1ada91d92dc2

diff --git a/agent/index.cpp b/agent/index.cpp
index a8ee7d8..979eb5f 100644
--- a/agent/index.cpp
+++ b/agent/index.cpp
@@ -46,8 +46,7 @@ Index::~Index()
 {
     delete m_collectionIndexer;
     m_collectionIndexer = Q_NULLPTR;
-    qDeleteAll(m_indexer.values().toSet());
-    m_indexer.clear();
+    qDeleteAll(m_listIndexer);
 }
 
 static void removeDir(const QString &dirName)
@@ -69,7 +68,8 @@ void Index::removeDatabase()
 {
     delete m_collectionIndexer;
     m_collectionIndexer = Q_NULLPTR;
-    qDeleteAll(m_indexer.values().toSet());
+    qDeleteAll(m_listIndexer);
+    m_listIndexer.clear();
     m_indexer.clear();
 
     qCDebug(AKONADI_INDEXER_AGENT_LOG) << "Removing database";
[prev in list] [next in list] [prev in thread] [next in thread]