Don't try to disable the same tech twice (#225)

ekolis · Jun 16, 2022 · d942939 · d942939
1 parent 66ce6a7
commit d942939
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/FrEee.WinForms/Forms/GameSetupForm.cs b/FrEee.WinForms/Forms/GameSetupForm.cs
@@ -1,4 +1,4 @@
-using FrEee.Game.Enumerations;
+using FrEee.Game.Enumerations;
 using FrEee.Game.Objects.Space;
 using FrEee.Game.Objects.Technology;
 using FrEee.Game.Objects.Vehicles;
@@ -709,7 +709,13 @@ private void SaveChanges()
  for (int i = 0; i < lstTechs.Items.Count; i++)
  {
  if (!lstTechs.GetItemChecked(i))
- setup.ForbiddenTechnologyNames.Add(((Technology)lstTechs.Items[i]).Name);
+ {
+ var techName = ((Technology)lstTechs.Items[i]).Name;
+ if (!setup.ForbiddenTechnologyNames.Contains(techName))
+ {
+ setup.ForbiddenTechnologyNames.Add(techName);
+ }
+ }
  }
  setup.StartingResources = (int)spnStartResources.Value;
  setup.ResourceStorage = (int)spnResourceStorage.Value;
@@ -828,4 +834,4 @@ private void btnGenerateSeed_Click(object sender, EventArgs e)
  spnSeed.Value = DateTime.Now.Millisecond + 1000 * DateTime.Now.Second + 60000 * DateTime.Now.Minute;
  }
  }
-}
+}
diff --git a/FrEee/Game/Setup/GameSetup.cs b/FrEee/Game/Setup/GameSetup.cs
@@ -265,7 +265,7 @@ public void PopulateGalaxy(Galaxy gal, PRNG dice)
  gal.CleanGameState();
 
  // remove forbidden techs
- foreach (var tname in ForbiddenTechnologyNames)
+ foreach (var tname in ForbiddenTechnologyNames.Distinct())
  Mod.Current.Technologies.Single(t => t.Name == tname).Dispose();
 
  // set omniscient view and all systems seen flags