Changeset 44039 in vbox for trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp

Timestamp:

Dec 5, 2012 12:08:52 PM (12 years ago)

Author:

vboxsync

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

82492

Message:

Main: renavation com::Guid class. PR5744

File:

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

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

@@ -951 +951 @@
          * with the stuff from the snapshot. */
         settings::Snapshot sn;
-        if (!d->snapshotId.isEmpty())
+
+        if (d->snapshotId.isValid() && !d->snapshotId.isZero())
             if (!d->findSnapshot(trgMCF.llFirstSnapshot, d->snapshotId, sn))
                 throw p->setError(E_FAIL,
@@ -960 +961 @@
         if (d->mode == CloneMode_MachineState)
         {
-            if (!sn.uuid.isEmpty())
+            if (sn.uuid.isValid() && !sn.uuid.isZero())
             {
                 trgMCF.hardwareMachine = sn.hardware;
@@ -971 +972 @@
         }
         else if (   d->mode == CloneMode_MachineAndChildStates
-                 && !sn.uuid.isEmpty())
+                    && sn.uuid.isValid()
+                    && !sn.uuid.isZero())
         {
             if (!d->pOldMachineState.isNull())
@@ -1323 +1325 @@
             /* Update the path in the configuration either for the current
              * machine state or the snapshots. */
-            if (sst.snapshotUuid.isEmpty())
+            if (!sst.snapshotUuid.isValid() || sst.snapshotUuid.isZero())
                 trgMCF.strStateFile = strTrgSaveState;
             else