diff options
| author | jacob1 <jfu614@gmail.com> | 2013-03-09 16:49:49 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-03-09 16:49:49 (GMT) |
| commit | 1ca39e1e7dc3659e4cb16aff515f30acfe88850d (patch) | |
| tree | a107be70630ef2c72e9f013c4d8b90eb8eabfbe2 /src | |
| parent | 189f96d35f220e7aad525fb790f231ae4edf5779 (diff) | |
| download | powder-1ca39e1e7dc3659e4cb16aff515f30acfe88850d.zip powder-1ca39e1e7dc3659e4cb16aff515f30acfe88850d.tar.gz | |
allow new searches even if tags haven't loaded
fixes search buttons being enabled but not working until the tags list is loaded
Diffstat (limited to 'src')
| -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(); |