Changeset 29149 in vbox

Timestamp:

May 6, 2010 12:55:49 PM (15 years ago)

Author:

vboxsync

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

61220

Message:

Main/Medium: add forgotten medium registry save when deleting the storage representation of a medium.

File:

• trunk/src/VBox/Main/MediumImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -3908 +3908 @@
 
         /* try to remove from the list of known hard disks before performing
-         * actual deletion (we favor the consistency of the media registry in
-         * the first place which would have been broken if
-         * unregisterWithVirtualBox() failed after we successfully deleted the
-         * storage) */
-        rc = unregisterWithVirtualBox(pfNeedsSaveSettings);
+         * actual deletion (we favor the consistency of the media registry
+         * which would have been broken if unregisterWithVirtualBox() failed
+         * after we successfully deleted the storage) */
+        bool fNeedsSaveSettings = false;
+        rc = unregisterWithVirtualBox(&fNeedsSaveSettings);
         if (FAILED(rc))
             throw rc;
+        // no longer need lock, and below we might need the VirtualBox lock.
+        multilock.release();
+        if (fNeedsSaveSettings)
+        {
+            AutoWriteLock vboxlock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
+            m->pVirtualBox->saveSettings();
+        }
+        // always set it to false because the medium registry is up to date
+        if (pfNeedsSaveSettings)
+            *pfNeedsSaveSettings = false;
 
         if (aProgress != NULL)