Changeset 38153 in vbox

Timestamp:

Jul 25, 2011 12:25:40 PM (14 years ago)

Author:

vboxsync

Message:

Main/Machine: fix snapshot tree handling for cloning "machine and child states", previously it didn't update the snapshot tree correctly if current state was in the cloned subtree

File:

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

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

@@ -815 +815 @@
                     if (fSubtreeIncludesCurrent)
                     {
-                        /* zap d->snapshotId because there is no need to
-                         * create a new current state. */
-                        d->snapshotId.clear();
                         if (pCurrState.isNull())
                             throw E_FAIL;
@@ -949 +946 @@
                  && !sn.uuid.isEmpty())
         {
-            /* Copy the snapshot data to the current machine. */
-            trgMCF.hardwareMachine = sn.hardware;
-            trgMCF.storageMachine  = sn.storage;
-
+            if (!d->pOldMachineState.isNull())
+            {
+                /* Copy the snapshot data to the current machine. */
+                trgMCF.hardwareMachine = sn.hardware;
+                trgMCF.storageMachine  = sn.storage;
+
+                /* Current state is under root snapshot. */
+                trgMCF.uuidCurrentSnapshot = sn.uuid;
+            }
             /* The snapshot will be the root one. */
-            trgMCF.uuidCurrentSnapshot = sn.uuid;
             trgMCF.llFirstSnapshot.clear();
             trgMCF.llFirstSnapshot.push_back(sn);