github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 21:03:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

searchengine: don't use strings to determine the status of search processes

Browse source 
'&' symbols are dynamically added to strings, making comparisons
unreliable.
This commit is contained in:
Gabriele 2015-08-02 13:51:41 +02:00 • committed by sledgehammer999
commit 4420ae1996
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/searchengine/searchengine.cpp
View file

@ -183,6 +183,7 @@ void SearchEngine::searchTextEdited(QString)
{ {
// Enable search button // Enable search button
search_button->setText(tr("Search")); search_button->setText(tr("Search"));
newQueryString = true;
} }
void SearchEngine::giveFocusToSearchInput() void SearchEngine::giveFocusToSearchInput()
@ -210,12 +211,14 @@ void SearchEngine::on_search_button_clicked()
searchProcess->waitForFinished(1000); searchProcess->waitForFinished(1000);
if (search_button->text() != tr("Search")) { if (!newQueryString) {
search_button->setText(tr("Search")); search_button->setText(tr("Search"));
return; return;
} }
} }
newQueryString = false;
// Reload environment variables (proxy) // Reload environment variables (proxy)
searchProcess->setEnvironment(QProcess::systemEnvironment()); searchProcess->setEnvironment(QProcess::systemEnvironment());

1
src/searchengine/searchengine.h
View file

@ -126,6 +126,7 @@ private:
QList<QPointer<SearchTab> > all_tab; // To store all tabs QList<QPointer<SearchTab> > all_tab; // To store all tabs
const SearchCategories full_cat_names; const SearchCategories full_cat_names;
MainWindow *mp_mainWindow; MainWindow *mp_mainWindow;
bool newQueryString;
}; };
#endif #endif