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

Timestamp:

May 27, 2015 1:43:12 PM (10 years ago)

Author:

vboxsync

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

100624

Message:

pr6522. added check of settings version.

File:

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

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

@@ -2623 +2623 @@
 {
 
-    // get all properties
-    xml::NodesLoop nl1(elmAudioAdapter, "Property");
-    const xml::ElementNode *pelmModeChild;
-    while ((pelmModeChild = nl1.forAllNodes()))
-    {
-        Utf8Str strPropName, strPropValue;
-        if (   pelmModeChild->getAttributeValue("name", strPropName)
-            && pelmModeChild->getAttributeValue("value", strPropValue) )
-            aa.properties[strPropName] = strPropValue;
-        else
-            throw ConfigFileError(this, pelmModeChild, N_("Required AudioAdapter/Property/@name or @value attribute "
-                                                          "is missing"));
+    if (m->sv >= SettingsVersion_v1_15)
+    {
+        // get all properties
+        xml::NodesLoop nl1(elmAudioAdapter, "Property");
+        const xml::ElementNode *pelmModeChild;
+        while ((pelmModeChild = nl1.forAllNodes()))
+        {
+            Utf8Str strPropName, strPropValue;
+            if (   pelmModeChild->getAttributeValue("name", strPropName)
+                && pelmModeChild->getAttributeValue("value", strPropValue) )
+                aa.properties[strPropName] = strPropValue;
+            else
+                throw ConfigFileError(this, pelmModeChild, N_("Required AudioAdapter/Property/@name or @value attribute "
+                                                              "is missing"));
+        }
     }
 
@@ -4746 +4749 @@
     pelmAudio->setAttribute("enabled", hw.audioAdapter.fEnabled);
 
-    if (hw.audioAdapter.properties.size() > 0)
+    if (m->sv >= SettingsVersion_v1_15 && hw.audioAdapter.properties.size() > 0)
     {
         for (StringsMap::const_iterator it = hw.audioAdapter.properties.begin();