2007-12-07 Tatsuhiro Tsujikawa <tujikawa at rednoah com>

	Fixed the bug#1845750; CTRL+C does not stop torrent.
	aria2 repeatedly sends stopped request when tracker returns error code.
	* src/AnnounceList.cc
	* test/AnnounceListTest.cc
	* src/AnnounceTier.h

	Added a message when ctrl-c is hit.
	Now second ctrl-c is also handled in signal handler.
	* src/RequestGroupMan.{h, cc}
	* src/RequestGroup.{h, cc}
	* src/MultiUrlRequestInfo.cc
	* src/DownloadEngine.cc
	* src/TrackerWatcherCommand.cc

1 files changed, 11 insertions, 0 deletions

diff --git a/src/TrackerWatcherCommand.cc b/src/TrackerWatcherCommand.cc
index 66f6d06f..181c5a2b 100644
--- a/src/TrackerWatcherCommand.cc
+++ b/src/TrackerWatcherCommand.cc
@@ -64,6 +64,17 @@ TrackerWatcherCommand::~TrackerWatcherCommand() {}
 
 
 bool TrackerWatcherCommand::execute() {
+  if(_requestGroup->isForceHaltRequested()) {
+    if(_trackerRequestGroup.isNull()) {
+      return true;
+    } else if(_trackerRequestGroup->getNumCommand() == 0 ||
+	      _trackerRequestGroup->downloadFinished()) {
+      return true;
+    } else {
+      _trackerRequestGroup->setForceHaltRequested(true);
+      return false;
+    }
+  }
   if(btAnnounce->noMoreAnnounce()) {
     logger->debug("no more announce");
     return true;