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

Timestamp:

Jul 15, 2022 1:26:12 PM (3 years ago)

Author:

vboxsync

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

152309

Message:

Recording/Main: Fixed migration from older settings (< 1.19). ​bugref:9286

File:

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

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

@@ -6048 +6048 @@
         elmRecording.getAttributeValue("screens",   cScreens);
 
-        /* Propagate the settings from screen 0 to all other screens (= monitors). */
+        /* Note: For settings < 1.19 the "screens" attribute is a bit field for all screens
+         *       which are ENABLED for recording. The settings for recording are for all the same though. */
         for (unsigned i = 0; i <  cScreens; i++)
         {
-            /* Add screen i to config in any case. */
+            /* Apply settings of screen 0 to screen i and enable it. */
             recording.mapScreens[i] = screen0;
 
@@ -6382 +6383 @@
             else if (pelmMachineChild->nameEquals("Autostart"))
                 readAutostart(*pelmMachineChild, autostart);
-            else if (pelmMachineChild->nameEquals("Recording")) /* Only exists for settings >= 1.19 (VBox 7.0). */
-                readRecordingSettings(*pelmMachineChild, recordingSettings);
             else if (pelmMachineChild->nameEquals("Groups"))
                 readGroups(*pelmMachineChild, machineUserData.llGroups);
+
+            if (   m->sv >= SettingsVersion_v1_14
+                && m->sv <  SettingsVersion_v1_19
+                && pelmMachineChild->nameEquals("VideoCapture"))   /* For settings >= 1.14 (< VBox 7.0). */
+                readRecordingSettings(*pelmMachineChild, recordingSettings);
+            else if (   m->sv >= SettingsVersion_v1_19
+                     && pelmMachineChild->nameEquals("Recording")) /* Only exists for settings >= 1.19 (VBox 7.0). */
+                readRecordingSettings(*pelmMachineChild, recordingSettings);
         }