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

Merge branch 'master' into test-3

Browse Source 
# Conflicts:
#	gui/builtinShipBrowser/fitItem.py
#	service/port.py
This commit is contained in:
blitzmann
2018-02-11 21:29:17 -05:00
parent c329f5eeb8 9bfc5b35b6
commit 5f0ce58c29
11 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gui/builtinShipBrowser/fitItem.py
View File

@@ -362,12 +362,13 @@ class FitItem(SFItem.SFBrowserItem):
self.deleted = True
sFit = Fit.getInstance()
fit = sFit.getFit(self.fitID)
# need to delete from import cache before actually deleting fit
if self.shipBrowser.GetActiveStage() == 5:
if fit in self.shipBrowser.lastdata: # remove fit from import cache
self.shipBrowser.lastdata.remove(fit)
for x in self.shipBrowser.lastdata: # remove fit from import cache
if x[0] == self.fitID:
self.shipBrowser.lastdata.remove(x)
break
sFit.deleteFit(self.fitID)
@@ -376,7 +377,7 @@ class FitItem(SFItem.SFBrowserItem):
# todo: would a simple RefreshList() work here instead of posting that a stage has been selected?
if self.shipBrowser.GetActiveStage() == 5:
wx.PostEvent(self.shipBrowser, ImportSelected(fits=self.shipBrowser.lastdata))
wx.PostEvent(self.shipBrowser, ImportSelected(fits=self.shipBrowser.lastdata, recent=self.shipBrowser.recentFits))
elif self.shipBrowser.GetActiveStage() == 4:
wx.PostEvent(self.shipBrowser, SearchSelected(text=self.shipBrowser.navpanel.lastSearch, back=True))
else: