Changeset 71309 in vbox

Timestamp:

Mar 13, 2018 9:06:18 AM (7 years ago)

Author:

vboxsync

Message:

bugref:8345. Improved logic updating the path of state files.

File:

• trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp

@@ -638 +638 @@
          * Update state file path
          * very important step!
+         * Not obvious how to do it correctly.
          */
         {
+            LogRelFunc(("Update state file path\n"));
             rc = taskMoveVM->updatePathsToStateFiles(taskMoveVM->finalSaveStateFilesMap,
                                                      taskMoveVM->vmFolders[VBox_SettingFolder],
@@ -1057 +1059 @@
     {
         const SAVESTATETASK &sst = itState->second;
-
-        Utf8Str strGuidMachine = sst.snapshotUuid.toString();
-        ComObjPtr<Snapshot> snapshotMachineObj;
-
-        rc = m_pMachine->i_findSnapshotById(sst.snapshotUuid, snapshotMachineObj, true);
-        if (SUCCEEDED(rc) && !snapshotMachineObj.isNull())
-        {
-            snapshotMachineObj->i_updateSavedStatePaths(sourcePath.c_str(),
-                                                        targetPath.c_str());
+           
+        if (sst.snapshotUuid != Guid::Empty)
+        {
+            Utf8Str strGuidMachine = sst.snapshotUuid.toString();
+            ComObjPtr<Snapshot> snapshotMachineObj;
+
+            rc = m_pMachine->i_findSnapshotById(sst.snapshotUuid, snapshotMachineObj, true);
+            if (SUCCEEDED(rc) && !snapshotMachineObj.isNull())
+            {
+                snapshotMachineObj->i_updateSavedStatePaths(sourcePath.c_str(),
+                                                            targetPath.c_str());
+            }
+        }
+        else
+        {
+            const Utf8Str &path = m_pMachine->mSSData->strStateFilePath;
+            m_pMachine->mSSData->strStateFilePath = Utf8StrFmt("%s%s",
+                                                               targetPath.c_str(),
+                                                               path.c_str() + sourcePath.length());
         }