From: Vishesh Handa Date: Wed, 13 May 2015 16:57:43 +0000 (+0200) Subject: Only perform operations with Baloo if it is enabled X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f5fd8e5cfb43deb1ccb0fef76e335afbde088965 Only perform operations with Baloo if it is enabled REVIEW: 125584 --- diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index b03fd9c1a..14e301522 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -278,7 +278,7 @@ void KFileItemModelRolesUpdater::setRoles(const QSet& roles) } } - if (hasBalooRole && !m_balooFileMonitor) { + if (hasBalooRole && m_balooConfig.fileIndexingEnabled() && !m_balooFileMonitor) { m_balooFileMonitor = new Baloo::FileMonitor(this); connect(m_balooFileMonitor, &Baloo::FileMonitor::fileMetaDataChanged, this, &KFileItemModelRolesUpdater::applyChangedBalooRoles); diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h index 216b0a501..6e7559fb5 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.h +++ b/src/kitemviews/kfileitemmodelrolesupdater.h @@ -46,6 +46,7 @@ namespace KIO { { class FileMonitor; } + #include #endif /** @@ -335,6 +336,7 @@ private: #ifdef HAVE_BALOO Baloo::FileMonitor* m_balooFileMonitor; + Baloo::IndexerConfig m_balooConfig; #endif };