Merge branch 'master' into test-3

This commit is contained in:
blitzmann
2018-02-24 22:24:16 -05:00
2 changed files with 3 additions and 2 deletions

View File

@@ -969,7 +969,7 @@ class MainFrame(wx.Frame):
if len(fits) > 0:
if len(fits) == 1:
fit = fits[0]
wx.PostEvent(self, FitSelected(fitID=fit.ID))
wx.PostEvent(self, FitSelected(fitID=fit.ID, from_import=True))
wx.PostEvent(self.shipBrowser, Stage3Selected(shipID=fit.shipID, back=True))
else:
fits.sort(key=lambda _fit: (_fit.ship.item.name, _fit.name))