From b59644709551bf90187cedeb022c3932b02795e1 Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Wed, 22 Nov 2017 21:44:15 -0500 Subject: [PATCH] Fix issue with deleting a fit while having certain other fits open (#1339) (#1340) Also, bump dev version --- config.py | 4 ++-- gui/builtinViewColumns/misc.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config.py b/config.py index c5379f477..86fa2e4a0 100644 --- a/config.py +++ b/config.py @@ -19,8 +19,8 @@ debug = False saveInRoot = False # Version data -version = "1.33.2" -tag = "Stable" +version = "1.33.3" +tag = "git" expansionName = "Lifeblood" expansionVersion = "1.7" evemonMinVersion = "4081" diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index cb8f8480f..35e2f20a9 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -49,6 +49,7 @@ class Miscellanea(ViewColumn): self.columnText = "Misc data" self.mask |= wx.LIST_MASK_TEXT self.mainFrame = gui.mainFrame.MainFrame.getInstance() + self.fittingView = fittingView def getText(self, stuff): return self.__getData(stuff)[0] @@ -487,7 +488,7 @@ class Miscellanea(ViewColumn): if not hp or not cycleTime or not cycles: return "", None - fit = Fit.getInstance().getFit(self.mainFrame.getActiveFit()) + fit = Fit.getInstance().getFit(self.fittingView.getActiveFit()) ehpTotal = fit.ehp hpTotal = fit.hp useEhp = self.mainFrame.statsPane.nameViewMap["resistancesViewFull"].showEffective