Ticket #415: 2.patch

src/file.c

@@ -1806 +1806 @@
         else
             dest_dir = panel->cwd;
         /*
-         * Add trailing backslash only when do non-locally ops.
+         * Add trailing backslash only when do non-local ops.
          * It saves user from occasional file renames (when destination
          * dir is deleted)
          */
-        if (force_single)
-            /* just copy */
-            dest_dir_ = g_strdup (dest_dir);
-        else
+        if (!force_single
+         && dest_dir[0]
+         && dest_dir[strlen(dest_dir)-1] != PATH_SEP) {
             /* add trailing separator */
-            if (*dest_dir && strcmp(&dest_dir[strlen(dest_dir)-1], PATH_SEP_STR)) {
-                dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char*)0);
+            dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char*)0);
         } else {
-                dest_dir_ = g_strdup (dest_dir);
+            /* just copy */
+            dest_dir_ = g_strdup (dest_dir);
         }
         if (!dest_dir_) {
             file_op_context_destroy (ctx);
@@ -1830 +1829 @@
                               single_entry, &do_bg);
         g_free(dest_dir_);
 
-        if (!dest) {
-            file_op_context_destroy (ctx);
-            return 0;
-        }
-        if (!*dest) {
+        if (!dest || !dest[0]) {
             file_op_context_destroy (ctx);
             g_free (dest);
             return 0;