Merge branch 'master' of https://github.com/pyfa-org/Pyfa

2018-05-19 14:53:07 -04:00
parent f1d3b68308 77a5896997
commit 6dbb61dc12
1 changed files with 3 additions and 0 deletions
--- a/gui/esiFittings.py
+++ b/gui/esiFittings.py
@@ -366,6 +366,9 @@ class FittingsTreeView(wx.Panel):
            if (fit['fitting_id'] in sEsi.fittings_deleted):
                continue
            ship = getItem(fit['ship_type_id'])
+            if ship is None:
+                pyfalog.debug('Cannot find ship type id: {}'.format(fit['ship_type_id']))
+                continue
            if ship.name not in dict:
                dict[ship.name] = []
            dict[ship.name].append(fit)