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

Timestamp:

Nov 5, 2009 11:57:29 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Storage Settings UI: Update to unique medium selection mechanism, taking into account snapshot's diff-disks (excluding for "don't show diffs" mode) and other VMs.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsHD.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsHD.cpp

@@ -484 +484 @@
              if (medium.isNull() || medium.medium().GetDeviceType() == deviceType)
              {
-                 /* In 'don't show diffs' mode we should filter out all the mediums
-                  * which are already attached to some snapshot of current VM. */
+                 /* In 'don't show diffs' mode we should only show hard-disks which are:
+                  * 1. Attached to 'current state' of this VM even if these are differencing disks.
+                  * 2. Not attached to this VM at all only if they are not differencing disks. */
                  if (!aShowDiffs && medium.type() == VBoxDefs::MediumType_HardDisk)
                  {
-                     if (!medium.medium().GetMachineIds().contains (parent()->machineId()) ||
-                         medium.isAttachedInCurStateTo (parent()->machineId()))
+                     if (medium.isAttachedInCurStateTo (parent()->machineId()) ||
+                         (!medium.medium().GetMachineIds().contains (parent()->machineId()) && !medium.parent()))
                          allMediums << medium.id();
                  }