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

Timestamp:

Oct 15, 2009 3:57:30 PM (16 years ago)

Author:

vboxsync

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

53550

Message:

API/Settings: fix writing old settings files (empty attachments were written)

File:

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

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2741 +2741 @@
             const AttachedDevice &att = *it2;
 
+            /* DVD/Floppy is handled already for settings version before 1.8 */
+            if (    att.deviceType == DeviceType_DVD
+                &&  m->sv <= SettingsVersion_v1_8)
+                continue;
+
             xml::ElementNode *pelmDevice = pelmController->createChild("AttachedDevice");
 
@@ -2751 +2756 @@
                 break;
 
-                case DeviceType_DVD:            // settings format 1.9
-                    if (m->sv >= SettingsVersion_v1_9)
-                    {
-                        pcszType = "DVD";
-                        if (att.fPassThrough)
-                            pelmDevice->setAttribute("passthrough", att.fPassThrough);
-                    }
+                case DeviceType_DVD:
+                    pcszType = "DVD";
+                    if (att.fPassThrough)
+                        pelmDevice->setAttribute("passthrough", att.fPassThrough);
                 break;
 
                 case DeviceType_Floppy:
-                    if (m->sv >= SettingsVersion_v1_9)
-                        pcszType = "Floppy";
+                    pcszType = "Floppy";
                 break;
             }
 
-            if (pcszType)       // can be NULL for pre-1.9 settings that shouldn't be written here
-            {
-                pelmDevice->setAttribute("type", pcszType);
-
-                pelmDevice->setAttribute("port", att.lPort);
-                pelmDevice->setAttribute("device", att.lDevice);
-
-                if (!att.uuid.isEmpty())
-                    pelmDevice->createChild("Image")->setAttribute("uuid", makeString(att.uuid));
-                else if (    (m->sv >= SettingsVersion_v1_9)
-                          && (att.strHostDriveSrc.length())
-                        )
-                    pelmDevice->createChild("HostDrive")->setAttribute("src", att.strHostDriveSrc);
-            }
+            pelmDevice->setAttribute("type", pcszType);
+
+            pelmDevice->setAttribute("port", att.lPort);
+            pelmDevice->setAttribute("device", att.lDevice);
+
+            if (!att.uuid.isEmpty())
+                pelmDevice->createChild("Image")->setAttribute("uuid", makeString(att.uuid));
+            else if (    (m->sv >= SettingsVersion_v1_9)
+                      && (att.strHostDriveSrc.length())
+                    )
+                pelmDevice->createChild("HostDrive")->setAttribute("src", att.strHostDriveSrc);
         }
     }