From d0457382054c02143ded04b9a48e809be9c49295 Mon Sep 17 00:00:00 2001
From: Tim Young <tim.young@lightsys.org>
Date: Wed, 2 May 2018 12:47:01 -0500
Subject: [PATCH] Better processing of wireless link autojoin

---
 EduNetworkBuilder/Network.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index 3a245cb..829c43c 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -215,7 +215,9 @@ namespace EduNetworkBuilder
 
             if (NetComponents.Count != CompareTo.NetComponents.Count) return false;
             for (int i = 0; i < NetComponents.Count; i++)
+            {
                 if (!NetComponents[i].Equals(CompareTo.NetComponents[i])) return false;
+            }
 
             if (Shapes.Count != CompareTo.Shapes.Count) return false;
             for (int i = 0; i < Shapes.Count; i++)
@@ -2133,6 +2135,7 @@ namespace EduNetworkBuilder
                     {
                         didanything = true;
                         nl.Destroy(); //We will rebuild it later
+                        NetComponents.RemoveAt(i);
                     }
                 }
             }
@@ -2159,6 +2162,8 @@ namespace EduNetworkBuilder
         {
             bool didanything = false;
             NetworkDevice nd;
+            _isDirty = true;
+            DoAllRemoveAllWirelessLinks(); //Remove them before we re-join them all
             foreach (NetworkComponent nc in NetComponents.ToList())
             {
                 if (NB.GetComponentType(nc) == GeneralComponentType.device)
@@ -2167,7 +2172,7 @@ namespace EduNetworkBuilder
                     didanything = nd.AutoJoinWireless() || didanything;
                 }
             }
-
+            UpdateImage();
             return didanything;
         }