diff options
| author | cracker64 <cracker642@gmail.com> | 2013-03-10 03:48:12 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2013-03-10 03:48:12 (GMT) |
| commit | 3abc33fd3b8bfaa720202ad2e4d5c46b9d51e9d7 (patch) | |
| tree | d7adefd78acebcc127c684a00bcd31e253ef148a /src/search/SearchModel.cpp | |
| parent | a9e66429d60c0867e540d645a8c52db79abb1736 (diff) | |
| parent | e6f6eedd1364fd3792d6ca7aa3ac2d0c97911f70 (diff) | |
| download | powder-3abc33fd3b8bfaa720202ad2e4d5c46b9d51e9d7.zip powder-3abc33fd3b8bfaa720202ad2e4d5c46b9d51e9d7.tar.gz | |
Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/search/SearchModel.cpp')
| -rw-r--r-- | src/search/SearchModel.cpp | 4 |
1 files changed, 2 insertions, 2 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; |