Changeset 26200 in vbox for trunk/src/VBox

Timestamp:

Feb 3, 2010 3:17:42 PM (15 years ago)

Author:

vboxsync

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

57222

Message:

Main: fix wrong assertions introduced by yesterday's settings changes

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (1 diff)
• MediumAttachmentImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2975 +2975 @@
             medium->attachTo(mData->mUuid);
         pAttach->updateMedium(medium, false /* aImplicit */);
+        setModified(IsModified_Storage);
     }
 

trunk/src/VBox/Main/MediumAttachmentImpl.cpp

@@ -358 +358 @@
 }
 
-/** Must be called from under this object's AND the machine's write lock. */
+/** Must be called from under this object's write lock. */
 void MediumAttachment::updateMedium(const ComObjPtr<Medium> &aMedium, bool aImplicit)
 {
-    Assert(m->pMachine->isWriteLockOnCurrentThread());
     Assert(isWriteLockOnCurrentThread());
 
@@ -367 +366 @@
     m->bd->pMedium = aMedium;
     m->bd->fImplicit = aImplicit;
-
-    m->pMachine->setModified(Machine::IsModified_Storage);
-}
-
-/** Must be called from under this object's AND the machine's write lock. */
+}
+
+/** Must be called from under this object's write lock. */
 void MediumAttachment::updatePassthrough(bool aPassthrough)
 {
-    Assert(m->pMachine->isWriteLockOnCurrentThread());
     Assert(isWriteLockOnCurrentThread());
 
     m->bd.backup();
     m->bd->fPassthrough = aPassthrough;
-
-    m->pMachine->setModified(Machine::IsModified_Storage);
-}
-
+}
+