Changeset 21779 in vbox

Timestamp:

Jul 24, 2009 10:13:27 AM (16 years ago)

Author:

vboxsync

Message:

ConsoleImpl.cpp: Allowing attachment change even if they are of same type.

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3353 +3353 @@
 
 #ifdef VBOX_DYNAMIC_NET_ATTACH
-            if (VBOX_SUCCESS (vrc) && !(eAttachmentType == meAttachmentType[ulInstance]))
+            if (VBOX_SUCCESS (vrc))
                 rc = doNetworkAdapterChange(pszAdapterName, ulInstance, 0, aNetworkAdapter);
 #endif /* VBOX_DYNAMIC_NET_ATTACH */
@@ -3464 +3464 @@
     AssertReturn (pThis, VERR_INVALID_PARAMETER);
 
-    AssertMsg (   (!strcmp (pszDevice, "pcnet") && uLun == 0 && uInstance < 8)
-               || (!strcmp (pszDevice, "e1000") && uLun == 0 && uInstance < 8),
+    AssertMsg (   (!strcmp (pszDevice, "pcnet") && uLun == 0 && uInstance < SchemaDefs::NetworkAdapterCount)
+               || (!strcmp (pszDevice, "e1000") && uLun == 0 && uInstance < SchemaDefs::NetworkAdapterCount),
                ("pszDevice=%s uLun=%d uInstance=%d\n", pszDevice, uLun, uInstance));
     Log(("pszDevice=%s uLun=%d uInstance=%d\n", pszDevice, uLun, uInstance));