1 files changed, 5 insertions, 2 deletions
diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc
index fd0ca927..38908436 100644
--- a/src/AbstractCommand.cc
+++ b/src/AbstractCommand.cc
@@ -169,9 +169,12 @@ bool AbstractCommand::execute() {
       req->getTryCount() >= _requestGroup->getMaxTries();
     if(isAbort) {
       onAbort();
+      req->resetUrl();
+    } else {
+      if(e->option->getAsBool(PREF_RESET_URI)) {
+	req->resetUrl();
+      }
     }
-    // In case where Request::getCurrentUrl() is not a valid URI.
-    req->resetUrl();
     if(isAbort) {
       logger->info(MSG_MAX_TRY, cuid, req->getTryCount());
       logger->error(MSG_DOWNLOAD_ABORTED, err, cuid, req->getUrl().c_str());