dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Make sure position is returned as None in case the module cannot be found on passed fit

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-17 22:37:44 +03:00
parent f4f92b0821
commit 4c04fd93ae
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eos/saveddata/module.py
View File

@@ -246,8 +246,12 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
# is set by sqlalchemy during flush # is set by sqlalchemy during flush
fit = fit if fit is not None else self.owner fit = fit if fit is not None else self.owner
if fit: if fit:
return fit.modules.index(self) if not self.isProjected else fit.projectedModules.index(self) container = fit.projectedModules if self.isProjected else fit.modules
try:
return container.index(self)
except ValueError:
return None
return None
@property @property
def isProjected(self): def isProjected(self):

1
gui/fitCommands/calc/module/localReplace.py
View File

@@ -50,7 +50,6 @@ class CalcReplaceLocalModuleCommand(wx.Command):
pyfalog.warning('Invalid charge') pyfalog.warning('Invalid charge')
self.Undo() self.Undo()
return False return False
newMod.owner = fit
try: try:
fit.modules.replace(self.position, newMod) fit.modules.replace(self.position, newMod)
except HandledListActionError: except HandledListActionError: