Changeset 28856 in vbox

Timestamp:

Apr 27, 2010 7:47:35 PM (15 years ago)

Author:

vboxsync

Message:

Main/Snapshot: update lock states at the end of a live merge to the default state

File:

• trunk/src/VBox/Main/SnapshotImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -3145 +3145 @@
         pTarget->deparent();
         pTarget->setParent(pParentForTarget);
-        if (aParentForTarget)
+        if (pParentForTarget)
             pSource->deparent();
 
@@ -3247 +3247 @@
     }
 
+    /* Could be in principle folded into the previous loop, but let's keep
+     * things simple. Update the medium locking to be the standard state:
+     * all parent images locked for reading, just the last diff for writing. */
+    lockListBegin = pMediumLockList->GetBegin();
+    lockListEnd = pMediumLockList->GetEnd();
+    MediumLockList::Base::iterator lockListLast = lockListEnd;
+    lockListLast--;
+    for (MediumLockList::Base::iterator it = lockListBegin;
+         it != lockListEnd;
+         ++it)
+    {
+         it->UpdateLock(it == lockListLast);
+    }
+
+
     return S_OK;
 }