Changeset 37828 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jul 8, 2011 8:09:58 AM (14 years ago)

Author:

vboxsync

Message:

Main/Console: fix regression introduced by the non-rotational medium support

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2921 +2921 @@
                 if (!pDrive)
                     InsertConfigNode(pCfg, g_apszIDEDrives[uLUN], &pDrive);
-                PCFGMNODE pNonRot = CFGMR3GetChild(pCtlInst, "NonRotationalMedium");
-                if (pNonRot)
-                    CFGMR3RemoveNode(pNonRot);
+                /* Don't use the RemoveConfigValue wrapper above, as we don't
+                 * know if the leaf is present or not. */
+                CFGMR3RemoveValue(pDrive,  "NonRotationalMedium");
                 InsertConfigInteger(pDrive, "NonRotationalMedium", !!fNonRotational);
             }
@@ -2932 +2932 @@
                 if (!pDrive)
                     InsertConfigNode(pCfg, strPort.c_str(), &pDrive);
-                PCFGMNODE pNonRot = CFGMR3GetChild(pCtlInst, "NonRotationalMedium");
-                if (pNonRot)
-                    CFGMR3RemoveNode(pNonRot);
+                /* Don't use the RemoveConfigValue wrapper above, as we don't
+                 * know if the leaf is present or not. */
+                CFGMR3RemoveValue(pDrive,  "NonRotationalMedium");
                 InsertConfigInteger(pDrive, "NonRotationalMedium", !!fNonRotational);
             }