Changeset 18173 in vbox for trunk/src

Timestamp:

Mar 24, 2009 11:20:24 AM (16 years ago)

Author:

vboxsync

Message:

Main: Protect every use of the StorageController list and remove second unneccessary call to rollback

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7750 +7750 @@
     }
 
-    if (mStorageControllers.isBackedUp())
-    {
-        /* unitialize all new devices (absent in the backed up list). */
-        StorageControllerList::const_iterator it = mStorageControllers->begin();
-        StorageControllerList *backedList = mStorageControllers.backedUpData();
-        while (it != mStorageControllers->end())
-        {
-            if (std::find (backedList->begin(), backedList->end(), *it ) ==
-                backedList->end())
+    if (!mStorageControllers.isNull())
+    {
+        if (mStorageControllers.isBackedUp())
+        {
+            /* unitialize all new devices (absent in the backed up list). */
+            StorageControllerList::const_iterator it = mStorageControllers->begin();
+            StorageControllerList *backedList = mStorageControllers.backedUpData();
+            while (it != mStorageControllers->end())
             {
-                (*it)->uninit();
+                if (std::find (backedList->begin(), backedList->end(), *it ) ==
+                    backedList->end())
+                {
+                    (*it)->uninit();
+                }
+                ++ it;
             }
-            ++ it;
-        }
-
-        /* restore the list */
-        mStorageControllers.rollback();
-    }
-
-    if (!mStorageControllers.isNull())
-    {
+
+            /* restore the list */
+            mStorageControllers.rollback();
+        }
+
         /* rollback any changes to devices after restoring the list */
         StorageControllerList::const_iterator it = mStorageControllers->begin();
@@ -7785 +7785 @@
 
     mHWData.rollback();
-
-    mStorageControllers.rollback();
 
     if (mHDData.isBackedUp())