Changeset 36395 in vbox for trunk/src/VBox

Timestamp:

Mar 24, 2011 11:54:52 AM (14 years ago)

Author:

vboxsync

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

70748

Message:

Main/xml/Settings: fAutoReset and hdType were sometimes not correctly initialized

File:

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

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

@@ -694 +694 @@
             med.strFormat = "RAW";
         }
+    
+        if (t == DVDImage)
+            med.hdType = MediumType_Readonly;
+        else if (t == FloppyImage)
+            med.hdType = MediumType_Writethrough;
     }
 
@@ -1013 +1018 @@
     if (devType == DeviceType_HardDisk || RTStrICmp(mdm.strFormat.c_str(), "RAW"))
         pelmMedium->setAttribute("format", mdm.strFormat);
-    if (mdm.fAutoReset)
+    if (   devType == DeviceType_HardDisk
+        && mdm.fAutoReset)
         pelmMedium->setAttribute("autoReset", mdm.fAutoReset);
     if (mdm.strDescription.length())
@@ -1030 +1036 @@
     if (level == 0)
     {
-        const char *pcszType =
-            mdm.hdType == MediumType_Normal ? "Normal" :
-            mdm.hdType == MediumType_Immutable ? "Immutable" :
-            mdm.hdType == MediumType_Writethrough ? "Writethrough" :
-            mdm.hdType == MediumType_Shareable ? "Shareable" :
-            mdm.hdType == MediumType_Readonly ? "Readonly" :
-            mdm.hdType == MediumType_MultiAttach ? "MultiAttach" :
-            "INVALID";
         // no need to save the usual DVD/floppy medium types
         if (   (   devType != DeviceType_DVD
@@ -1044 +1042 @@
             && (   devType != DeviceType_Floppy
                 || mdm.hdType != MediumType_Writethrough))
+        {
+            const char *pcszType =
+                mdm.hdType == MediumType_Normal ? "Normal" :
+                mdm.hdType == MediumType_Immutable ? "Immutable" :
+                mdm.hdType == MediumType_Writethrough ? "Writethrough" :
+                mdm.hdType == MediumType_Shareable ? "Shareable" :
+                mdm.hdType == MediumType_Readonly ? "Readonly" :
+                mdm.hdType == MediumType_MultiAttach ? "MultiAttach" :
+                "INVALID";
             pelmMedium->setAttribute("type", pcszType);
+        }
     }