Changeset 20852 in vbox

Timestamp:

Jun 23, 2009 4:21:46 PM (16 years ago)

Author:

vboxsync

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

48995

Message:

Main: Don't assert when a DVD/Floppy image was unmounted at runtime.

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -10956 +10956 @@
  * Locks the attached media.
  *
- * All attached hard disks and DVD/floppy are locked for writing. Parents of
- * attached hard disks (if any) are locked for reading.
+ * All attached hard disks are locked for writing and DVD/floppy are locked for
+ * reading. Parents of attached hard disks (if any) are locked for reading.
  *
  * This method also performs accessibility check of all media it locks: if some
@@ -11155 +11155 @@
             rc = it->first->UnlockRead (&state);
 
-        /* the latter can happen if an object was re-locked in
-         * Machine::fixupHardDisks() */
-        Assert (SUCCEEDED (rc) || state == MediaState_LockedRead);
+        /* The second can happen if an object was re-locked in
+         * Machine::fixupHardDisks(). The last can happen when e.g a DVD/Floppy
+         * image was unmounted at runtime. */
+        Assert (SUCCEEDED (rc) || state == MediaState_LockedRead || state == MediaState_Created);
     }