Browse Source

2010-04-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Fixed the bug that hash check hangs when aria2.pause is issued
	while aria2 is checking piece hashes.  Fixed the bug that the
	download is paused after file allocation completion even if
	aria2.pause is issued during file allocation.
	* src/CheckIntegrityCommand.cc
	* src/FileAllocationCommand.cc
Tatsuhiro Tsujikawa 15 years ago
parent
commit
70664af0ad
3 changed files with 12 additions and 1 deletions
  1. 9 0
      ChangeLog
  2. 1 0
      src/CheckIntegrityCommand.cc
  3. 2 1
      src/FileAllocationCommand.cc

+ 9 - 0
ChangeLog

@@ -1,3 +1,12 @@
+2010-04-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed the bug that hash check hangs when aria2.pause is issued
+	while aria2 is checking piece hashes.  Fixed the bug that the
+	download is paused after file allocation completion even if
+	aria2.pause is issued during file allocation.
+	* src/CheckIntegrityCommand.cc
+	* src/FileAllocationCommand.cc
+
 2010-04-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added nsl to search-libs for getaddrinfo on opensolaris

+ 1 - 0
src/CheckIntegrityCommand.cc

@@ -58,6 +58,7 @@ CheckIntegrityCommand::~CheckIntegrityCommand() {}
 bool CheckIntegrityCommand::executeInternal()
 {
   if(_requestGroup->isHaltRequested()) {
+    _e->_checkIntegrityMan->dropPickedEntry();
     return true;
   }
   _entry->validateChunk();

+ 2 - 1
src/FileAllocationCommand.cc

@@ -59,7 +59,8 @@ FileAllocationCommand::~FileAllocationCommand() {}
 
 bool FileAllocationCommand::executeInternal()
 {
-  if(_e->isHaltRequested()) {
+  if(_requestGroup->isHaltRequested()) {
+    _e->_fileAllocationMan->dropPickedEntry();
     return true;
   }
   _fileAllocationEntry->allocateChunk();