From 804d90c50cf3029c5cde90eaf988e3a40353b6eb Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Sun, 5 Aug 2018 08:17:24 -0400 Subject: [PATCH] Don't run adding command on implants and boosters if item is already item --- gui/fitCommands/calc/fitAddBooster.py | 6 +++++- gui/fitCommands/calc/fitAddImplant.py | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gui/fitCommands/calc/fitAddBooster.py b/gui/fitCommands/calc/fitAddBooster.py index 61f4f5b49..d030c4026 100644 --- a/gui/fitCommands/calc/fitAddBooster.py +++ b/gui/fitCommands/calc/fitAddBooster.py @@ -20,11 +20,16 @@ class FitAddBoosterCommand(wx.Command): self.itemID = itemID self.new_index = None self.old_item = None + def Do(self): pyfalog.debug("Adding booster ({0}) to fit ID: {1}", self.itemID, self.fitID) fit = eos.db.getFit(self.fitID) item = eos.db.getItem(self.itemID, eager="attributes") + + if next((x for x in fit.boosters if x.itemID == self.itemID), None): + return False # already have item in list of boosters + try: booster = Booster(item) except ValueError: @@ -32,7 +37,6 @@ class FitAddBoosterCommand(wx.Command): return False self.old_item = fit.boosters.makeRoom(booster) - fit.boosters.append(booster) self.new_index = fit.boosters.index(booster) return True diff --git a/gui/fitCommands/calc/fitAddImplant.py b/gui/fitCommands/calc/fitAddImplant.py index b65b53e69..ae8ea848b 100644 --- a/gui/fitCommands/calc/fitAddImplant.py +++ b/gui/fitCommands/calc/fitAddImplant.py @@ -25,6 +25,10 @@ class FitAddImplantCommand(wx.Command): fit = eos.db.getFit(self.fitID) item = eos.db.getItem(self.itemID, eager="attributes") + + if next((x for x in fit.implants if x.itemID == self.itemID), None): + return False # already have item in list of implants + try: implant = Implant(item) except ValueError: