Changeset 37834 in vbox

Timestamp:

Jul 8, 2011 10:20:49 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings / Storage page: Settings save bug fix (dvd/floppy attachment device/port change).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -3584 +3584 @@
 {
     /* IMediumAttachment could be indirectly updated through IMachine
-     * only if attachment device type was NOT changed and is one of the next types:
+     * only if attachment type, device and port were NOT changed and is one of the next types:
      * KDeviceType_Floppy or KDeviceType_DVD.
      * For other cases we will recreate attachment fully: */
@@ -3591 +3591 @@
     KDeviceType initialAttachmentDeviceType = initialAttachmentData.m_attachmentType;
     KDeviceType currentAttachmentDeviceType = currentAttachmentData.m_attachmentType;
+    LONG iInitialAttachmentDevice = initialAttachmentData.m_iAttachmentDevice;
+    LONG iCurrentAttachmentDevice = currentAttachmentData.m_iAttachmentDevice;
+    LONG iInitialAttachmentPort = initialAttachmentData.m_iAttachmentPort;
+    LONG iCurrentAttachmentPort = currentAttachmentData.m_iAttachmentPort;
     return (currentAttachmentDeviceType == initialAttachmentDeviceType) &&
+           (iCurrentAttachmentDevice == iInitialAttachmentDevice) &&
+           (iCurrentAttachmentPort == iInitialAttachmentPort) &&
            (currentAttachmentDeviceType == KDeviceType_Floppy || currentAttachmentDeviceType == KDeviceType_DVD);
 }