diff --git a/eos b/eos index 6efa234c6..c14478668 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 6efa234c6680f399fd997c1db10a05aee59e0696 +Subproject commit c144786682cb7245c903522df8ca86654dde28ac diff --git a/gui/gangView.py b/gui/gangView.py index adea6b0cc..fb7068435 100644 --- a/gui/gangView.py +++ b/gui/gangView.py @@ -166,7 +166,7 @@ class GangView ( ScrolledPanel ): elif type == 2: fleetSrv.setLinearSquadCom(boostee, booster) - sFit.recalc(boostee) + sFit.recalc(boostee, withBoosters=True) wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=activeFitID)) def fitSelected(self, event): @@ -226,7 +226,7 @@ class GangView ( ScrolledPanel ): fleetSrv.setLinearWingCom(boostee, booster) elif type == 2: fleetSrv.setLinearSquadCom(boostee, booster) - sFit.recalc(boostee) + sFit.recalc(boostee, withBoosters=True) wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=activeFitID)) def RefreshCharacterList(self, event = None): diff --git a/service/fit.py b/service/fit.py index 69304f777..4afee6439 100644 --- a/service/fit.py +++ b/service/fit.py @@ -166,7 +166,7 @@ class Fit(object): fit.damagePattern = self.pattern eos.db.commit() - self.recalc(fit) + self.recalc(fit, withBoosters=True) def getFit(self, fitID): if fitID is None: @@ -181,7 +181,7 @@ class Fit(object): fit.fleet = None else: fit.fleet = f - self.recalc(fit) + self.recalc(fit, withBoosters=True) fit.fill() eos.db.commit() fit.inited = True @@ -649,6 +649,6 @@ class Fit(object): else: return currState - def recalc(self, fit): + def recalc(self, fit, withBoosters=False): fit.clear() - fit.calculateModifiedAttributes() + fit.calculateModifiedAttributes(withBoosters=withBoosters)