From 4420ae19961fa1d1b81edc227380939a12caab8c Mon Sep 17 00:00:00 2001 From: Gabriele Date: Sun, 2 Aug 2015 13:51:41 +0200 Subject: [PATCH] searchengine: don't use strings to determine the status of search processes '&' symbols are dynamically added to strings, making comparisons unreliable. --- src/searchengine/searchengine.cpp | 5 ++++- src/searchengine/searchengine.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/searchengine/searchengine.cpp b/src/searchengine/searchengine.cpp index 6efc461f6..cee0d8593 100644 --- a/src/searchengine/searchengine.cpp +++ b/src/searchengine/searchengine.cpp @@ -183,6 +183,7 @@ void SearchEngine::searchTextEdited(QString) { // Enable search button search_button->setText(tr("Search")); + newQueryString = true; } void SearchEngine::giveFocusToSearchInput() @@ -210,12 +211,14 @@ void SearchEngine::on_search_button_clicked() searchProcess->waitForFinished(1000); - if (search_button->text() != tr("Search")) { + if (!newQueryString) { search_button->setText(tr("Search")); return; } } + newQueryString = false; + // Reload environment variables (proxy) searchProcess->setEnvironment(QProcess::systemEnvironment()); diff --git a/src/searchengine/searchengine.h b/src/searchengine/searchengine.h index e21e58bc5..68d229688 100644 --- a/src/searchengine/searchengine.h +++ b/src/searchengine/searchengine.h @@ -126,6 +126,7 @@ private: QList > all_tab; // To store all tabs const SearchCategories full_cat_names; MainWindow *mp_mainWindow; + bool newQueryString; }; #endif