From dd9924a7a76a30ce08c66af97faa1efd89e06dae Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Thu, 9 Feb 2017 07:22:09 -0800 Subject: [PATCH] Fix issues where we assume something can exist when it may not. --- eos/saveddata/fit.py | 6 ++++-- gui/builtinViews/fittingView.py | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index 426f263e3..a058b8184 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -443,9 +443,11 @@ class Fit(object): self.__modifier = currModifier self.__origin = origin if hasattr(currModifier, "itemModifiedAttributes"): - currModifier.itemModifiedAttributes.fit = origin or self + if hasattr(currModifier.itemModifiedAttributes, "fit"): + currModifier.itemModifiedAttributes.fit = origin or self if hasattr(currModifier, "chargeModifiedAttributes"): - currModifier.chargeModifiedAttributes.fit = origin or self + if hasattr(currModifier.itemModifiedAttributes, "fit"): + currModifier.chargeModifiedAttributes.fit = origin or self def getModifier(self): return self.__modifier diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 94578d8ac..904782ab5 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -408,6 +408,9 @@ class FittingView(d.Display): if mod1.slot != mod2.slot: return + if not getattr(mod2, "modPosition"): + self.mods.modPosition = mod2.modPosition = dstRow + if clone and mod2.isEmpty: sFit.cloneModule(self.mainFrame.getActiveFit(), srcIdx, mod2.modPosition) else: