Skip to content

Commit

Permalink
Fix exception with character implants, and don't show implant set men…
Browse files Browse the repository at this point in the history
…u if there aren't any (pyfa-org#1172)
  • Loading branch information
blitzmann committed May 16, 2017
1 parent 89b508d commit 65f71b6
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
6 changes: 6 additions & 0 deletions gui/builtinContextMenus/implantSets.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ def display(self, srcContext, selection):
if not self.settings.get('implantSets'):
return False

sIS = s_ImplantSets.getInstance()
implantSets = sIS.getImplantSetList()

if len(implantSets) == 0:
return False

return srcContext in ("implantView", "implantEditor")

def getText(self, itmContext, selection):
Expand Down
11 changes: 11 additions & 0 deletions gui/implantView.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ def fitChanged(self, event):
activeFitID = self.mainFrame.getActiveFit()
fit = sFit.getFit(activeFitID)
if fit:
self.source = fit.implantSource
if fit.implantSource == ImplantLocation.FIT:
self.rbFit.SetValue(True)
else:
Expand Down Expand Up @@ -159,6 +160,10 @@ def addItem(self, event):
event.Skip()

def removeItem(self, event):
# Character implants can't be changed here...
if self.Parent.source == ImplantLocation.CHARACTER:
return

row, _ = self.HitTest(event.Position)
if row != -1:
col = self.getColumn(event.Position)
Expand All @@ -168,11 +173,17 @@ def removeItem(self, event):
def removeImplant(self, implant):
fitID = self.mainFrame.getActiveFit()
sFit = Fit.getInstance()

sFit.removeImplant(fitID, self.original.index(implant))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))

def click(self, event):
event.Skip()

# Character implants can't be changed here...
if self.Parent.source == ImplantLocation.CHARACTER:
return

row, _ = self.HitTest(event.Position)
if row != -1:
col = self.getColumn(event.Position)
Expand Down

0 comments on commit 65f71b6

Please sign in to comment.