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

Timestamp:

Jan 22, 2013 9:29:47 AM (12 years ago)

Author:

vboxsync

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

83270

Message:

Main/Snapshot: the merge procedure became a little bit better. Procedure take into account only those sizes of disks which are essentially needed for carrying out the merge.

File:

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

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

@@ -2523 +2523 @@
                 ComObjPtr<Medium> pTarget_local = it_md->mpTarget;
                 ComPtr<IMediumFormat> pTargetFormat;
+
+                {
+                    if ( pSource_local.isNull() ||
+                         pSource_local == pTarget_local )
+                    {
+                        ++it_md;
+                        continue;
+                    }
+                }
 
                 rc = pTarget_local->COMGETTER(MediumFormat)(pTargetFormat.asOutParam());