Changeset 31817 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 20, 2010 1:04:25 PM (14 years ago)

Author:

vboxsync

Message:

Main: cleanup medium objects from media registry, second try

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -426 +426 @@
             autoInitSpan.setSucceeded();
         else
+        {
             autoInitSpan.setLimited();
+
+            // uninit media from this machine's media registry, or else
+            // reloading the settings will fail
+            mParent->unregisterMachineMedia(getId());
+        }
     }
 
@@ -503 +509 @@
             autoInitSpan.setSucceeded();
         else
+        {
             autoInitSpan.setLimited();
+
+            // uninit media from this machine's media registry, or else
+            // reloading the settings will fail
+            mParent->unregisterMachineMedia(getId());
+        }
     }
 
@@ -680 +692 @@
         /* rollback all changes */
         rollback(false /* aNotify */);
+
+        // uninit media from this machine's media registry, or else
+        // reloading the settings will fail
+        mParent->unregisterMachineMedia(getId());
 
         /* uninitialize the common part to make sure all data is reset to
@@ -755 +771 @@
     }
 
-    // uninit media from this machine's media registry
+    // uninit media from this machine's media registry, if they're still there
     mParent->unregisterMachineMedia(getId());