diff --git a/TODO b/TODO index 5affcbfc6..7ad19e3f0 100644 --- a/TODO +++ b/TODO @@ -58,4 +58,5 @@ rc9->rc10 changelog: - BUGFIX: Fixed proxy host max length in preferences - BUGFIX: Added a 3 minutes search engine timeout - BUGFIX: Limit search engine plugins to 10 result pages +- BUGFIX: Fixed nbResults != 0 when clearing results while a search is running - COSMETIC: Use more skin colors instead of hard coded ones diff --git a/src/searchEngine.cpp b/src/searchEngine.cpp index c1eff8c4a..9d7c11f6b 100644 --- a/src/searchEngine.cpp +++ b/src/searchEngine.cpp @@ -465,12 +465,13 @@ void SearchEngine::on_clear_button_clicked(){ // Kill process searchProcess->terminate(); search_stopped = true; - + searchTimeout->stop(); searchResultsUrls.clear(); SearchListModel->removeRows(0, SearchListModel->rowCount()); // Disable clear & download buttons clear_button->setEnabled(false); download_button->setEnabled(false); + nb_search_results = 0; results_lbl->setText(tr("Results")+" (0):"); // focus on search pattern search_pattern->clear(); diff --git a/src/src.pro b/src/src.pro index 8906c9185..846eeec11 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,7 +3,7 @@ LANG_PATH = lang ICONS_PATH = Icons #Set the following variable to 1 to enable debug -DEBUG_MODE = 0 +DEBUG_MODE = 1 # Global TEMPLATE = app