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

	Fixed the bug that aria2.unpause fails with -s1.
	* src/FileEntry.cc
	* src/XmlRpcMethodImpl.cc

ChangeLog

@@ -1,3 +1,9 @@
+2010-04-23  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed the bug that aria2.unpause fails with -s1.
+	* src/FileEntry.cc
+	* src/XmlRpcMethodImpl.cc
+
 2010-04-22  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added missing #ifdef HAVE_PORT_ASSOCIATE

src/FileEntry.cc

@@ -313,10 +313,7 @@ void FileEntry::reuseUri(size_t num)
   }
   // Reuse at least num URIs here to avoid to
   // run this process repeatedly.
-  if(ininum > 0 && ininum < num) {
-    if(_logger->debug()) {
-      _logger->debug("fewer than num=%u", num);
-    }
+  if(ininum > 0) {
     for(size_t i = 0; i < num/ininum; ++i) {
       _uris.insert(_uris.end(), reusableURIs.begin(), reusableURIs.end());
     }

src/XmlRpcMethodImpl.cc

@@ -360,9 +360,9 @@ static bool pauseRequestGroup
       // Call setHaltRequested before setPauseRequested because
       // setHaltRequested calls setPauseRequested(false) internally.
       if(forcePause) {
-        group->setForceHaltRequested(true, RequestGroup::USER_REQUEST);
+        group->setForceHaltRequested(true, RequestGroup::NONE);
       } else {
-        group->setHaltRequested(true, RequestGroup::USER_REQUEST);
+        group->setHaltRequested(true, RequestGroup::NONE);
       }
     }
     group->setPauseRequested(true);