Changeset 29204 in vbox

Timestamp:

May 7, 2010 12:44:33 PM (15 years ago)

Author:

vboxsync

Message:

Main/Medium: improve r61220 (add forgotten medium registry save when deleting the storage representation of a medium)

Location:

trunk/src/VBox/Main

Files:

• MediumImpl.cpp (modified) (2 diffs)
• SnapshotImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -2162 +2162 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
+    bool fNeedsSaveSettings = false;
     ComObjPtr <Progress> pProgress;
 
-    HRESULT rc = deleteStorage(&pProgress, false /* aWait */,
-                               NULL /* pfNeedsSaveSettings */);
+    HRESULT rc = deleteStorage(&pProgress,
+                               false /* aWait */,
+                               &fNeedsSaveSettings);
+    if (fNeedsSaveSettings)
+    {
+        AutoWriteLock vboxlock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
+        m->pVirtualBox->saveSettings();
+    }
+
     if (SUCCEEDED(rc))
         pProgress.queryInterfaceTo(aProgress);
@@ -3911 +3919 @@
          * which would have been broken if unregisterWithVirtualBox() failed
          * after we successfully deleted the storage) */
-        bool fNeedsSaveSettings = false;
-        rc = unregisterWithVirtualBox(&fNeedsSaveSettings);
+        rc = unregisterWithVirtualBox(pfNeedsSaveSettings);
         if (FAILED(rc))
             throw rc;
-        // no longer need lock, and below we might need the VirtualBox lock.
+        // no longer need 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)

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -1714 +1714 @@
 
     bool stateRestored = false;
-    bool fNeedsSaveSettings = false;
+    bool fNeedsGlobalSaveSettings = false;
 
     try
@@ -1760 +1760 @@
                                      1,
                                      false /* aOnline */,
-                                     &fNeedsSaveSettings);
+                                     &fNeedsGlobalSaveSettings);
             if (FAILED(rc))
                 throw rc;
@@ -1893 +1893 @@
 
         // save machine settings, reset the modified flag and commit;
-        rc = saveSettings(&fNeedsSaveSettings, SaveS_ResetCurStateModified | saveFlags);
+        rc = saveSettings(&fNeedsGlobalSaveSettings,
+                          SaveS_ResetCurStateModified | saveFlags);
         if (FAILED(rc))
             throw rc;
@@ -1910 +1911 @@
             HRESULT rc2 = pMedium->deleteStorage(NULL /* aProgress */,
                                                  true /* aWait */,
-                                                 &fNeedsSaveSettings);
+                                                 &fNeedsGlobalSaveSettings);
             // ignore errors here because we cannot roll back after saveSettings() above
             if (SUCCEEDED(rc2))
                 pMedium->uninit();
         }
-
-        if (fNeedsSaveSettings)
-        {
-            // finally, VirtualBox.xml needs saving too
-            AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-            mParent->saveSettings();
-        }
     }
     catch (HRESULT aRC)
@@ -1942 +1936 @@
             updateMachineStateOnClient();
         }
+    }
+
+    if (fNeedsGlobalSaveSettings)
+    {
+        // finally, VirtualBox.xml needs saving too
+        AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
+        mParent->saveSettings();
     }