Changeset 97541 in vbox

Timestamp:

Nov 15, 2022 6:17:13 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154571

Message:

Guest Control/Main: Some more fixes. bugref:10286

File:

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

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

@@ -1854 +1854 @@
             }
 
-            /* Translate the final host destination file path. */
-            vrc = GuestPath::Translate(strDstRootAbs,
-                                       mSession->i_getGuestPathStyle() /* Dest */, PATH_STYLE_NATIVE /* Source */);
-            if (RT_FAILURE(vrc))
-            {
-                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(tr("Translating host destination path \"%s\" failed: %Rrc"),
-                                               strDstRootAbs.c_str(), vrc));
-                break;
-            }
-
-            if (   RT_SUCCESS(vrc)
-                && !pList->mSourceSpec.fDryRun)
-                vrc = fileCopyFromGuest(strSrcRootAbs, strDstRootAbs, pList->mSourceSpec.fFileCopyFlags);
+            if (RT_SUCCESS(vrc))
+            {
+                /* Translate the final host destination file path. */
+                vrc = GuestPath::Translate(strDstRootAbs,
+                                           mSession->i_getGuestPathStyle() /* Dest */, PATH_STYLE_NATIVE /* Source */);
+                if (RT_FAILURE(vrc))
+                {
+                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                        Utf8StrFmt(tr("Translating host destination path \"%s\" failed: %Rrc"),
+                                                   strDstRootAbs.c_str(), vrc));
+                    break;
+                }
+
+                if (!pList->mSourceSpec.fDryRun)
+                    vrc = fileCopyFromGuest(strSrcRootAbs, strDstRootAbs, pList->mSourceSpec.fFileCopyFlags);
+            }
         }
         else
@@ -2342 +2344 @@
             }
 
-            /* Translate the final guest destination file path. */
-            vrc = GuestPath::Translate(strDstRootAbs,
-                                       PATH_STYLE_NATIVE /* Source */,  mSession->i_getGuestPathStyle() /* Dest */);
-            if (RT_FAILURE(vrc))
-            {
-                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(tr("Translating guest destination path \"%s\" failed: %Rrc"),
-                                               strDstRootAbs.c_str(), vrc));
-                break;
-            }
-
-            if (   RT_SUCCESS(vrc)
-                && !pList->mSourceSpec.fDryRun)
-                vrc = fileCopyToGuest(strSrcRootAbs, strDstRootAbs, pList->mSourceSpec.fFileCopyFlags);
+            if (RT_SUCCESS(vrc))
+            {
+                /* Translate the final guest destination file path. */
+                vrc = GuestPath::Translate(strDstRootAbs,
+                                           PATH_STYLE_NATIVE /* Source */,  mSession->i_getGuestPathStyle() /* Dest */);
+                if (RT_FAILURE(vrc))
+                {
+                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                        Utf8StrFmt(tr("Translating guest destination path \"%s\" failed: %Rrc"),
+                                                   strDstRootAbs.c_str(), vrc));
+                    break;
+                }
+
+                if (!pList->mSourceSpec.fDryRun)
+                    vrc = fileCopyToGuest(strSrcRootAbs, strDstRootAbs, pList->mSourceSpec.fFileCopyFlags);
+            }
         }
         else