- a search request can now be terminated by another

Changelog

@@ -25,6 +25,7 @@
     - FEATURE: Added keyboard shortcuts for main actions (see wiki)
     - FEATURE: Added a popup menu to set priority for multiple fies at once
     - FEATURE: Improved a lot downloading from urls (using libcommoncpp2 instead of libcurl)
+    - FEATURE: A search request can now be terminated by another
     - I18N: Added Hungarian translation
     - BUGFIX: Progress of paused torrents is now correct on restart
     - BUGFIX: Progress column gets sorted on restart it is was during last execution

TODO

@@ -44,7 +44,6 @@
 * beta3
   - Windows port (Chris - Peerkoel)
   - Translations update
-  - Allow to abort a search by launching another one
 * beta2
   - Wait for some bug fixes in libtorrent :
     - upload/download limit per torrent

src/searchEngine.cpp

@@ -260,6 +260,10 @@ void SearchEngine::saveSearchHistory()
 
 // Function called when we click on search button
 void SearchEngine::on_search_button_clicked(){
+  if(searchProcess->state() != QProcess::NotRunning){
+    searchProcess->kill();
+    searchProcess->waitForFinished();
+  }
   QString pattern = search_pattern->text().trimmed();
   // No search pattern entered
   if(pattern.isEmpty()){
@@ -319,8 +323,6 @@ void SearchEngine::on_search_button_clicked(){
 
 void SearchEngine::searchStarted(){
   // Update SearchEngine widgets
-  search_button->setEnabled(false);
-  search_button->repaint();
   search_status->setText(tr("Searching..."));
   search_status->repaint();
   stop_search_button->setEnabled(true);