vbox的更動 62339 路徑 trunk/src/VBox/Main

時間撮記:

2016-7-20 上午08:09:11 (8 年 以前)

作者:

vboxsync

訊息:

Main/xml/Settings.cpp: fix last remaining (pretty harmless) default settings difference for old VM configs (5.0 or older)

檔案:

• trunk/src/VBox/Main/xml/Settings.cpp (修改) (5 筆差異)

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

@@ -2106 +2106 @@
  */
 VRDESettings::VRDESettings() :
-    fEnabled(false),
+    fEnabled(true), // default for old VMs, for new ones it's false
     authType(AuthType_Null),
     ulAuthTimeout(5000),
@@ -2117 +2117 @@
  * Check if all settings have default values.
  */
-bool VRDESettings::areDefaultSettings() const
-{
-    return !fEnabled
+bool VRDESettings::areDefaultSettings(SettingsVersion_T sv) const
+{
+    return (sv < SettingsVersion_v1_16 ? fEnabled : !fEnabled)
         && authType == AuthType_Null
         && (ulAuthTimeout == 5000 || ulAuthTimeout == 0)
@@ -3086 +3086 @@
     uFaultToleranceInterval(0),
     fRTCUseUTC(false),
-    strVMPriority("")
+    strVMPriority()
 {
     llGroups.push_back("/");
@@ -3721 +3721 @@
          * Legacy. This needs to matched by areParavirtDefaultSettings(). */
         hw.paravirtProvider = ParavirtProvider_Default;
+        /* The new default is disabled, before it was enabled by default. */
+        hw.vrdeSettings.fEnabled = false;
         /* The new default is disabled, before it was enabled by default. */
         hw.audioAdapter.fEnabled = false;
@@ -5403 +5405 @@
     }
 
-    if (!hw.vrdeSettings.areDefaultSettings())
+    if (!hw.vrdeSettings.areDefaultSettings(m->sv))
     {
         xml::ElementNode *pelmVRDE = pelmHardware->createChild("RemoteDisplay");
-        if (hw.vrdeSettings.fEnabled)
+        if (m->sv < SettingsVersion_v1_16 ? !hw.vrdeSettings.fEnabled : hw.vrdeSettings.fEnabled)
             pelmVRDE->setAttribute("enabled", hw.vrdeSettings.fEnabled);
         if (m->sv < SettingsVersion_v1_11)