Changeset 31467 in vbox

Timestamp:

Aug 9, 2010 9:29:25 AM (15 years ago)

Author:

vboxsync

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

64549

Message:

Main: settings: bumpSettingsVersionIfNeeded(): fix broken 1.11 check for network settings

File:

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

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

@@ -4150 +4150 @@
     if (m->sv < SettingsVersion_v1_11)
     {
-        // VirtualBox 3.3 adds support for HD audio
-        if (hardwareMachine.audioAdapter.controllerType == AudioControllerType_HDA)
-            m->sv = SettingsVersion_v1_11;
-
-        // VirtualBox 3.3 adds support for CPU priority
-        if (hardwareMachine.ulCpuPriority != 100)
-            m->sv = SettingsVersion_v1_11;
-
-        // .. and we now have per-machine media registries
-        if (    mediaRegistry.llHardDisks.size()
+        // VirtualBox 3.3 adds HD audio, CPU priorities and per-machine media registries
+        if (    hardwareMachine.audioAdapter.controllerType == AudioControllerType_HDA
+             || hardwareMachine.ulCpuPriority != 100
+             || mediaRegistry.llHardDisks.size()
              || mediaRegistry.llDvdImages.size()
              || mediaRegistry.llFloppyImages.size()
@@ -4174 +4168 @@
              ++netit)
         {
-            if (netit->ulBandwidthLimit)
+            if (    (m->sv < SettingsVersion_v1_11)
+                 && (netit->ulBandwidthLimit)
+               )
             {
                 /* New in VirtualBox 3.3 */
@@ -4180 +4176 @@
                 break;
             }
-
-            if (    netit->fEnabled
-                 && netit->mode == NetworkAttachmentType_NAT
-                 && (   netit->nat.u32Mtu != 0
-                     || netit->nat.u32SockRcv != 0
-                     || netit->nat.u32SockSnd != 0
-                     || netit->nat.u32TcpRcv != 0
-                     || netit->nat.u32TcpSnd != 0
-                     || !netit->nat.fDnsPassDomain
-                     || netit->nat.fDnsProxy
-                     || netit->nat.fDnsUseHostResolver
-                     || netit->nat.fAliasLog
-                     || netit->nat.fAliasProxyOnly
-                     || netit->nat.fAliasUseSamePorts
-                     || netit->nat.strTftpPrefix.length()
-                     || netit->nat.strTftpBootFile.length()
-                     || netit->nat.strTftpNextServer.length()
-                     || netit->nat.llRules.size())
-                )
+            else if (    (m->sv < SettingsVersion_v1_10)
+                      && (netit->fEnabled)
+                      && (netit->mode == NetworkAttachmentType_NAT)
+                      && (   netit->nat.u32Mtu != 0
+                          || netit->nat.u32SockRcv != 0
+                          || netit->nat.u32SockSnd != 0
+                          || netit->nat.u32TcpRcv != 0
+                          || netit->nat.u32TcpSnd != 0
+                          || !netit->nat.fDnsPassDomain
+                          || netit->nat.fDnsProxy
+                          || netit->nat.fDnsUseHostResolver
+                          || netit->nat.fAliasLog
+                          || netit->nat.fAliasProxyOnly
+                          || netit->nat.fAliasUseSamePorts
+                          || netit->nat.strTftpPrefix.length()
+                          || netit->nat.strTftpBootFile.length()
+                          || netit->nat.strTftpNextServer.length()
+                          || netit->nat.llRules.size()
+                         )
+                     )
             {
                 m->sv = SettingsVersion_v1_10;
-                break;
-            }
-            if (    netit->fEnabled
-                 && netit->ulBootPriority != 0)
+                // no break because we still might need v1.11 above
+            }
+            else if (    (m->sv < SettingsVersion_v1_10)
+                      && (netit->fEnabled)
+                      && (netit->ulBootPriority != 0)
+                    )
             {
                 m->sv = SettingsVersion_v1_10;
-                break;
+                // no break because we still might need v1.11 above
             }
         }
@@ -4219 +4218 @@
 
         // VirtualBox 3.2 adds support for VRDP video channel
-        if (hardwareMachine.vrdpSettings.fVideoChannel)
+        else if (hardwareMachine.vrdpSettings.fVideoChannel)
             m->sv = SettingsVersion_v1_10;
     }
@@ -4334 +4333 @@
        )
         m->sv = SettingsVersion_v1_4;
-
-
-
 }