Changeset 86065 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 8, 2020 11:50:44 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9623: UIMediumManager: Make sure medium release call is done for every suitable attachment machine has, even if that's applicable to cd attachment only, not to hd/fd.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp

@@ -442 +442 @@
 bool UIMediumItemHD::releaseFrom(CMachine comMachine)
 {
+    /* Was medium released from at least one attachment? */
+    bool fAtLeastOneRelease = false;
+
     /* Enumerate attachments: */
     CMediumAttachmentVector attachments = comMachine.GetMediumAttachments();
@@ -467 +470 @@
             return false;
         }
-
-        /* Return success: */
-        return true;
-    }
-
-    /* False by default: */
-    return false;
+        else
+            fAtLeastOneRelease = true;
+    }
+
+    /* Return whether there was at least one release: */
+    return fAtLeastOneRelease;
 }
 
@@ -561 +563 @@
 bool UIMediumItemCD::releaseFrom(CMachine comMachine)
 {
+    /* Was medium released from at least one attachment? */
+    bool fAtLeastOneRelease = false;
+
     /* Enumerate attachments: */
     CMediumAttachmentVector attachments = comMachine.GetMediumAttachments();
@@ -581 +586 @@
             return false;
         }
-
-        /* Return success: */
-        return true;
-    }
-
-    /* Return failure: */
-    return false;
+        else
+            fAtLeastOneRelease = true;
+    }
+
+    /* Return whether there was at least one release: */
+    return fAtLeastOneRelease;
 }
 
@@ -628 +632 @@
 bool UIMediumItemFD::releaseFrom(CMachine comMachine)
 {
+    /* Was medium released from at least one attachment? */
+    bool fAtLeastOneRelease = false;
+
     /* Enumerate attachments: */
     CMediumAttachmentVector attachments = comMachine.GetMediumAttachments();
@@ -648 +655 @@
             return false;
         }
-
-        /* Return success: */
-        return true;
-    }
-
-    /* Return failure: */
-    return false;
-}
+        else
+            fAtLeastOneRelease = true;
+    }
+
+    /* Return whether there was at least one release: */
+    return fAtLeastOneRelease;
+}