Changeset 81419 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Oct 21, 2019 4:26:00 PM (5 years ago)

Author:

vboxsync

Message:

Main/MachineImplMoveVM: fix regression in previous change, if current state has no associated saved state

File:

• trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp (modified) (1 diff)

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

@@ -1135 +1135 @@
         pSnapshot->i_updateSavedStatePaths(sourcePath.c_str(),
                                            targetPath.c_str());
-    if (RTPathStartsWith(m_pMachine->mSSData->strStateFilePath.c_str(), sourcePath.c_str()))
-        m_pMachine->mSSData->strStateFilePath = Utf8StrFmt("%s%s",
-                                                           targetPath.c_str(),
-                                                           m_pMachine->mSSData->strStateFilePath.c_str() + sourcePath.length());
-    else
-        m_pMachine->mSSData->strStateFilePath = Utf8StrFmt("%s%c%s",
-                                                           targetPath.c_str(),
-                                                           RTPATH_DELIMITER,
-                                                           RTPathFilename(m_pMachine->mSSData->strStateFilePath.c_str()));
+    if (m_pMachine->mSSData->strStateFilePath.isNotEmpty())
+    {
+        if (RTPathStartsWith(m_pMachine->mSSData->strStateFilePath.c_str(), sourcePath.c_str()))
+            m_pMachine->mSSData->strStateFilePath = Utf8StrFmt("%s%s",
+                                                               targetPath.c_str(),
+                                                               m_pMachine->mSSData->strStateFilePath.c_str() + sourcePath.length());
+        else
+            m_pMachine->mSSData->strStateFilePath = Utf8StrFmt("%s%c%s",
+                                                               targetPath.c_str(),
+                                                               RTPATH_DELIMITER,
+                                                               RTPathFilename(m_pMachine->mSSData->strStateFilePath.c_str()));
+    }
 }