From a8a2ba188d31668d0b62854e4b7a750ae80e7c42 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Wed, 2 Jun 2010 13:45:20 +0000 Subject: [PATCH] Search requests can now be cancelled on Win32 --- src/searchengine.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/searchengine.cpp b/src/searchengine.cpp index 42a191830..14af871e1 100644 --- a/src/searchengine.cpp +++ b/src/searchengine.cpp @@ -287,7 +287,11 @@ void SearchEngine::on_search_button_clicked(){ } #endif if(searchProcess->state() != QProcess::NotRunning){ +#ifdef Q_WS_WIN + searchProcess->kill(); +#else searchProcess->terminate(); +#endif search_stopped = true; if(searchTimeout->isActive()) { searchTimeout->stop(); @@ -546,7 +550,11 @@ void SearchEngine::searchFinished(int exitcode,QProcess::ExitStatus){ parent->showNotificationBaloon(tr("Search Engine"), tr("Search has finished")); } if(exitcode){ +#ifdef Q_WS_WIN + search_status->setText(tr("Search aborted")); +#else search_status->setText(tr("An error occured during search...")); +#endif }else{ if(search_stopped){ search_status->setText(tr("Search aborted"));