summaryrefslogtreecommitdiffstats
path: root/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-12-03 17:46:41 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-12-03 17:46:41 (GMT)
commitcf5d234f8d99488a0c3b47b0a7cca0601052a9fa (patch)
tree441ad280f402be6cd4a58aefd24b260c21ab685d /tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
parentc7739f7dd55a5a88e0efb00895f63d512cb16fe5 (diff)
parent68f4b46426e715540864046128617250a521d38a (diff)
downloadQt-cf5d234f8d99488a0c3b47b0a7cca0601052a9fa.zip
Qt-cf5d234f8d99488a0c3b47b0a7cca0601052a9fa.tar.gz
Qt-cf5d234f8d99488a0c3b47b0a7cca0601052a9fa.tar.bz2
Merge branch '4.6'
Diffstat (limited to 'tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp')
-rw-r--r--tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
index f23efa5..f767e27 100644
--- a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
+++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
@@ -579,6 +579,7 @@ void QHelpSearchIndexWriter::cancelIndexing()
void QHelpSearchIndexWriter::updateIndex(const QString &collectionFile,
const QString &indexFilesFolder, bool reindex)
{
+ wait();
mutex.lock();
this->m_cancel = false;
this->m_reindex = reindex;