Changeset 24727 in vbox for trunk

Timestamp:

Nov 17, 2009 4:02:49 PM (15 years ago)

Author:

vboxsync

Message:

Main/MachineImpl: in DetachDrive don't forget to remove the backrefs for floppy/dvd images.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2726 +2726 @@
                         aDevice, aControllerPort, aControllerName);
 
+    ComObjPtr<Medium> oldmedium = pAttach->medium();
+    DeviceType_T mediumType = pAttach->type();
 
     if (pAttach->isImplicit())
@@ -2744 +2746 @@
         alock.leave();
 
-        ComObjPtr<Medium> hd = pAttach->medium();
-        rc = hd->deleteStorageAndWait();
+        rc = oldmedium->deleteStorageAndWait();
 
         alock.enter();
@@ -2760 +2761 @@
      * still refers to the original and is not valid for the copy */
     mMediaData->mAttachments.remove(pAttach);
+
+    /* For non-hard disk media, detach straight away. */
+    if (mediumType != DeviceType_HardDisk && !oldmedium.isNull())
+        oldmedium->detachFrom(mData->mUuid);
 
     return S_OK;