Changeset 29925 in vbox for trunk/src/VBox/Main/ApplianceImpl.cpp

Timestamp:

May 31, 2010 6:33:15 PM (15 years ago)

Author:

vboxsync

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

62192

Message:

OVF: respect override of import parameters (setFinalValues) also when vbox:Machine is present, first batch (everything except storage)

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1057 +1057 @@
         bstr.cloneTo(&sfaOrigValues[i]);
 
-        bstr = vsde.strVbox;
+        bstr = vsde.strVboxCurrent;
         bstr.cloneTo(&sfaVboxValues[i]);
 
-        bstr = vsde.strExtraConfig;
+        bstr = vsde.strExtraConfigCurrent;
         bstr.cloneTo(&sfaExtraConfigValues[i]);
     }
@@ -1120 +1120 @@
         bstr.cloneTo(&sfaOrigValues[i]);
 
-        bstr = vsde->strVbox;
+        bstr = vsde->strVboxCurrent;
         bstr.cloneTo(&sfaVboxValues[i]);
 
-        bstr = vsde->strExtraConfig;
+        bstr = vsde->strExtraConfigCurrent;
         bstr.cloneTo(&sfaExtraConfigValues[i]);
     }
@@ -1168 +1168 @@
             case VirtualSystemDescriptionValueType_Reference: bstr = vsde->strRef; break;
             case VirtualSystemDescriptionValueType_Original: bstr = vsde->strOvf; break;
-            case VirtualSystemDescriptionValueType_Auto: bstr = vsde->strVbox; break;
-            case VirtualSystemDescriptionValueType_ExtraConfig: bstr = vsde->strExtraConfig; break;
+            case VirtualSystemDescriptionValueType_Auto: bstr = vsde->strVboxCurrent; break;
+            case VirtualSystemDescriptionValueType_ExtraConfig: bstr = vsde->strExtraConfigCurrent; break;
         }
 
@@ -1221 +1221 @@
         if (sfaEnabled[i])
         {
-            vsde.strVbox = sfaVboxValues[i];
-            vsde.strExtraConfig = sfaExtraConfigValues[i];
+            vsde.strVboxCurrent = sfaVboxValues[i];
+            vsde.strExtraConfigCurrent = sfaExtraConfigValues[i];
         }
         else
@@ -1270 +1270 @@
     vsde.strRef = strRef;
     vsde.strOvf = aOvfValue;
-    vsde.strVbox = aVboxValue;
-    vsde.strExtraConfig = strExtraConfig;
+    vsde.strVboxSuggested           // remember original value
+        = vsde.strVboxCurrent       // and set current value which can be overridden by setFinalValues()
+        = aVboxValue;
+    vsde.strExtraConfigSuggested
+        = vsde.strExtraConfigCurrent
+        = strExtraConfig;
     vsde.ulSizeMB = ulSizeMB;