=== modified file 'win32/SearchFrame.cpp' --- win32/SearchFrame.cpp 2008-07-02 23:33:08 +0000 +++ win32/SearchFrame.cpp 2008-07-03 09:03:44 +0000 @@ -1010,6 +1010,21 @@ results->clear(); + // Add new searches to the last-search dropdown list + if(find(lastSearches.begin(), lastSearches.end(), s) == lastSearches.end()) + { + int i = max(SETTING(SEARCH_HISTORY)-1, 0); + + if(searchBox->size() > i) + searchBox->erase(i); + searchBox->insertValue(0, s); + + while(lastSearches.size() > (TStringList::size_type)i) { + lastSearches.erase(lastSearches.begin()); + } + lastSearches.push_back(s); + } + { Lock l(cs); currentSearch = StringTokenizer(s, ' ').getTokens(); @@ -1035,21 +1050,6 @@ int ftype = fileType->getSelected(); - // Add new searches to the last-search dropdown list - if(find(lastSearches.begin(), lastSearches.end(), s) == lastSearches.end()) - { - int i = max(SETTING(SEARCH_HISTORY)-1, 0); - - if(searchBox->size() > i) - searchBox->erase(i); - searchBox->insertValue(0, s); - - while(lastSearches.size() > (TStringList::size_type)i) { - lastSearches.erase(lastSearches.begin()); - } - lastSearches.push_back(s); - } - setStatus(STATUS_STATUS, str(TF_("Searching for %1%...") % s)); setStatus(STATUS_COUNT, Util::emptyStringT); setStatus(STATUS_FILTERED, Util::emptyStringT);