1 files changed, 18 insertions, 3 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 1f7e4cb7..5a03b657 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -603,16 +603,31 @@ initiateDownload(GtkTreeModel * model,
     FREENONNULL(idc_mime);
     return;
   }
-  if (idc_name == NULL) {
+  /* reduce "//" to "/" */
+  if (idc_name != NULL) {
+    while (strstr(idc_name, "//") != NULL) 
+      memcpy(strstr(idc_name, "//"),
+             strstr(idc_name, "//") + 1,
+             strlen(strstr(idc_name, "//")));
+  }
+  /* if no name given or just "/", produce better name */
+  if ( (idc_name == NULL) ||
+       (0 == strcmp("/", idc_name)) ) {
 #ifdef WINDOWS
     char * filehash;
 
-    filehash = STRDUP(sdc.uri_name);
+    GE_ASSERT(NULL, 
+              strlen(sdc.uri_name) > strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX));
+    FREENONNULL(idc_name);
+    filehash = STRDUP(&sdc.uri_name[strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX)]);
     filehash[16] = 0;
     idc_name = STRDUP(filehash);
     FREENONNULL(filehash);
 #else
-    idc_name = STRDUP(sdc.uri_name);
+    GE_ASSERT(NULL, 
+              strlen(sdc.uri_name) > strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX));
+    FREENONNULL(idc_name);
+    idc_name = STRDUP(&sdc.uri_name[strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX)]);
 #endif
   }