Changeset 95654 in vbox

Timestamp:

Jul 14, 2022 2:10:18 PM (2 years ago)

Author:

vboxsync

Message:

Recording/Main: Added fallback for settings >= 1.14 and < 1.19 when writing settings. Not really needed, but better have it anyway. bugref:9286

File:

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

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

@@ -75 +75 @@
 #include <iprt/base64.h>
 #include <iprt/cpp/lock.h>
+#include <iprt/cpp/utils.h>
 #include <iprt/cpp/xml.h>
 #include <iprt/ctype.h>
@@ -6381 +6382 @@
             else if (pelmMachineChild->nameEquals("Autostart"))
                 readAutostart(*pelmMachineChild, autostart);
-            else if (pelmMachineChild->nameEquals("Recording"))
+            else if (pelmMachineChild->nameEquals("Recording")) /* Only exists for settings >= 1.19 (VBox 7.0). */
                 readRecordingSettings(*pelmMachineChild, recordingSettings);
             else if (pelmMachineChild->nameEquals("Groups"))
@@ -8345 +8346 @@
     buildDebuggingXML(elmMachine, debugging);
     buildAutostartXML(elmMachine, autostart);
-    buildRecordingXML(elmMachine, recordingSettings);
+
+    /* Note: Must come *after* buildHardwareXML(), as the "Hardware" branch is needed. */
+    if (   m->sv >= SettingsVersion_v1_14
+        && m->sv  < SettingsVersion_v1_19) /* < VBox 7.0. */
+    {
+        xml::ElementNode *pelHardware = unconst(elmMachine.findChildElement("Hardware"));
+        if (pelHardware)
+            buildRecordingXML(*pelHardware, recordingSettings);
+    }
+    else if (m->sv >= SettingsVersion_v1_19) /* Now lives outside of "Hardware", in "Machine". */
+        buildRecordingXML(elmMachine, recordingSettings);
+
     buildGroupsXML(elmMachine, machineUserData.llGroups);
 }