diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs index 8e5bdf6..3a245cb 100644 --- a/EduNetworkBuilder/Network.cs +++ b/EduNetworkBuilder/Network.cs @@ -326,8 +326,7 @@ namespace EduNetworkBuilder break; case "link": newNL = new NetworkLink(Individual); - if(newNL.theLinkType != LinkType.wireless) - NetComponents.Add(newNL); //do no load wireless links. Rebuild them + NetComponents.Add(newNL); break; case "device": newND = new NetworkDevice(Individual); @@ -404,6 +403,7 @@ namespace EduNetworkBuilder } } } + DoAllRemoveAllWirelessLinks(); //remove all wireless links. They will be rebuilt below DoAllVerifyLinks(); DoAllAutoJoin(); OpenHelpIfNeeded(skipOpeningWindows); @@ -2118,6 +2118,26 @@ namespace EduNetworkBuilder return didanything; } + public bool DoAllRemoveAllWirelessLinks() + { + NetworkLink nl; + bool didanything = false; + NetworkComponent nc; + for (int i = NetComponents.Count - 1; i >= 0; i--) + { + nc = NetComponents[i]; + if (nc is NetworkLink) + { + nl = (NetworkLink)nc; + if(nl.theLinkType == LinkType.wireless) + { + didanything = true; + nl.Destroy(); //We will rebuild it later + } + } + } + return didanything; + } public bool DoAllMarkAsLinked() { bool didanything = false;