Changeset 27200 in vbox

Timestamp:

Mar 9, 2010 10:10:52 AM (15 years ago)

Author:

vboxsync

Message:

Main: fix assertion and crash when unregistering ISO

File:

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

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1373 +1373 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+//     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     /// @todo update m->description and save the global registry (and local
     /// registries of portable VMs referring to this medium), this will also
     /// require to add the mRegistered flag to data
+
+    NOREF(aDescription);
 
     ReturnComNotImplemented();
@@ -2061 +2063 @@
     }
 
+    // make a copy of VirtualBox pointer which gets nulled by uninit()
+    ComObjPtr<VirtualBox> pVirtualBox(m->pVirtualBox);
+
     /* Keep the locks held until after uninit, as otherwise the consistency
      * of the medium tree cannot be guaranteed. */
@@ -2070 +2075 @@
     {
         AutoWriteLock vboxlock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
-        m->pVirtualBox->saveSettings();
+        pVirtualBox->saveSettings();
     }