Changeset 71827 in vbox for trunk

Timestamp:

Apr 11, 2018 4:23:23 PM (7 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Fixes for copying directory contents vs. entire directories from/to guest.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -1130 +1130 @@
         && !strSrcDir.endsWith("\\"))
     {
-        if (   !strDstDir.endsWith("/")
-            && !strDstDir.endsWith("\\"))
-            strDstDir += "/";
-
-        strDstDir += Utf8StrFmt("%s", RTPathFilename(strSrcDir.c_str()));
+        if (   strDstDir.endsWith("/")
+            || strDstDir.endsWith("\\"))
+        {
+            strDstDir += Utf8StrFmt("%s", RTPathFilename(strSrcDir.c_str()));
+        }
     }
 
@@ -1353 +1353 @@
         && !strSrcDir.endsWith("\\"))
     {
-        if (   !strDstDir.endsWith("/")
-            && !strDstDir.endsWith("\\"))
-            strDstDir += "/";
-
-        strDstDir += Utf8StrFmt("%s", RTPathFilename(strSrcDir.c_str()));
+        if (   strDstDir.endsWith("/")
+            || strDstDir.endsWith("\\"))
+        {
+            strDstDir += Utf8StrFmt("%s", RTPathFilename(strSrcDir.c_str()));
+        }
     }