diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs index a9588d7..d2ff8ed 100644 --- a/EduNetworkBuilder/NetworkBuilder.cs +++ b/EduNetworkBuilder/NetworkBuilder.cs @@ -532,7 +532,7 @@ namespace EduNetworkBuilder public void UpdateMenu() { - if (myNetwork.NetworkFilename != "") + if (myNetwork.NetworkFilename != "" || storedNetworkStates.Count > 0) { reloadToolStripMenuItem.Enabled = true; } @@ -2032,6 +2032,17 @@ namespace EduNetworkBuilder PrepForLoad(); myNetwork.Load(oldfile); } + else + { + if(storedNetworkStates.Count > 0) + { + Network theNet = storedNetworkStates[storedNetworkStates.Count -1]; + storedNetworkStates.Clear(); + ForwardstoredNetworkStates.Clear(); + PrepForLoad(); + LoadNetworkFromNetwork(theNet); + } + } UpdateMenu(); UpdateForm(); } @@ -2189,6 +2200,7 @@ namespace EduNetworkBuilder xmlDoc.LoadXml(myString); PrepForLoad(); myNetwork.Load(xmlDoc, resource, true, SkipOpeningWindows);//Load it from resource. Set the bool saying it was from resource + StoreNetworkState(myNetwork); //Store a clean state UpdateMenu(); UpdateForm(); } @@ -2205,6 +2217,7 @@ namespace EduNetworkBuilder UpdateLinks(); UpdateForm(); NBSettings ns = NB.GetSettings(); + StoreNetworkState(myNetwork); //Store a clean state if (ns != null && ns.AutoDHCPAllMachinesAtNetworkLoad) myNetwork.DoAllDHCP(); } @@ -2212,7 +2225,9 @@ namespace EduNetworkBuilder private void LoadSolvedResource(string what) { + PrepForLoad(); LoadNetworkFromResource(what); + StoreNetworkState(myNetwork); //Store a clean state myNetwork.OverrideFromResources(); UpdateForm(); UpdateMessages(); @@ -2225,6 +2240,7 @@ namespace EduNetworkBuilder //Then "unsolve" it myNetwork.DoAllClearIPs(); myNetwork.OverrideFromResources(); + StoreNetworkState(myNetwork); //Store a clean state UpdateForm(); UpdateMessages(); }