diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-12 21:21:01 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-12 21:21:01 (GMT) |
| commit | de680a1e5cd65c771a9ed659510fb48b2916a5f0 (patch) | |
| tree | 660919b656177aa469d4dc17571e9b7dfcc7d4a2 /src/search | |
| parent | 86b7a118004c9f9797d4d898dd587000e5178cea (diff) | |
| parent | 134d1fab10a713ce0e99bfc3325b099abcbbe591 (diff) | |
| download | powder-de680a1e5cd65c771a9ed659510fb48b2916a5f0.zip powder-de680a1e5cd65c771a9ed659510fb48b2916a5f0.tar.gz | |
Merge
Diffstat (limited to 'src/search')
| -rw-r--r-- | src/search/SearchModel.cpp | 4 | ||||
| -rw-r--r-- | src/search/SearchModel.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/search/SearchModel.cpp b/src/search/SearchModel.cpp index 913e95b..f4de2d6 100644 --- a/src/search/SearchModel.cpp +++ b/src/search/SearchModel.cpp @@ -64,7 +64,7 @@ void * SearchModel::updateTagListT() void SearchModel::UpdateSaveList(int pageNumber, std::string query) { //Threading - if(!updateSaveListWorking && !updateTagListWorking) + if(!updateSaveListWorking) { lastQuery = query; lastError = ""; @@ -84,7 +84,7 @@ void SearchModel::UpdateSaveList(int pageNumber, std::string query) selected.clear(); notifySelectedChanged(); - if(GetShowTags() && !tagList.size()) + if(GetShowTags() && !tagList.size() && !updateTagListWorking) { updateTagListFinished = false; updateTagListWorking = true; diff --git a/src/search/SearchModel.h b/src/search/SearchModel.h index 9e93f05..0fe9480 100644 --- a/src/search/SearchModel.h +++ b/src/search/SearchModel.h @@ -48,7 +48,7 @@ private: bool updateTagListWorking; volatile bool updateTagListFinished; pthread_t updateTagListThread; - static void * updateTagListTHelper(void * obj); + static void * updateTagListTHelper(void * obj); void * updateTagListT(); public: SearchModel(); |