From b02506d6cd959902abb585227ebb5d0676fd5026 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sat, 15 Apr 2017 22:33:45 -0400 Subject: [PATCH] fixes issue in which fit was recalced on fit switch when characters were different, regardless of calculation state. --- gui/characterSelection.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gui/characterSelection.py b/gui/characterSelection.py index 3ee531d8f..4b6fddc73 100644 --- a/gui/characterSelection.py +++ b/gui/characterSelection.py @@ -152,12 +152,16 @@ class CharacterSelection(wx.Panel): return False def fitChanged(self, event): + """ + When fit is changed, or new fit is selected + """ self.charChoice.Enable(event.fitID is not None) choice = self.charChoice sFit = Fit.getInstance() currCharID = choice.GetClientData(choice.GetCurrentSelection()) fit = sFit.getFit(event.fitID) newCharID = fit.character.ID if fit is not None else None + if event.fitID is None: self.skillReqsStaticBitmap.SetBitmap(self.cleanSkills) self.skillReqsStaticBitmap.SetToolTipString("No active fit") @@ -186,7 +190,8 @@ class CharacterSelection(wx.Panel): elif currCharID != newCharID: self.selectChar(newCharID) - self.charChanged(None) + if not fit.calculated: + self.charChanged(None) event.Skip()