Changeset 46351 in vbox for trunk/src/VBox/Main/xml

Timestamp:

May 31, 2013 8:25:22 PM (12 years ago)

Author:

vboxsync

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

86144

Message:

The ICON data isn't required, it's optional so dont fail in copyMachineDataToSettings because of this. For the same reason, don't save the <Icon> element unconditionally, only when there is actual data. Because, we have to bump the settings version when using <Icon>.

File:

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

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

@@ -4849 +4849 @@
     if (machineUserData.strDescription.length())
         elmMachine.createChild("Description")->addContent(machineUserData.strDescription);
-    elmMachine.setAttribute("Icon", machineUserData.ovIcon);
+    if (machineUserData.ovIcon.length())
+        elmMachine.setAttribute("Icon", machineUserData.ovIcon);
     elmMachine.setAttribute("OSType", machineUserData.strOsType);
     if (    strStateFile.length()
@@ -5051 +5052 @@
         if (   !hardwareMachine.strDefaultFrontend.isEmpty()
             || hardwareMachine.graphicsControllerType != GraphicsControllerType_VBoxVGA
-            || hardwareMachine.enmLongMode != Hardware::LongMode_Legacy)
+            || hardwareMachine.enmLongMode != Hardware::LongMode_Legacy
+            || machineUserData.ovIcon.length() > 0)
             m->sv = SettingsVersion_v1_14;
     }