Quick fix for override window crashing trying to load items that no l…

…onger exist (pyfa-org#706)
meldi44 · Aug 27, 2016 · 64b7530 · 64b7530
1 parent 0eef1ee
commit 64b7530
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/eos/db/saveddata/override.py b/eos/db/saveddata/override.py
@@ -24,7 +24,7 @@
 from eos.types import Override
 
 overrides_table = Table("overrides", saveddata_meta,
-                     Column("itemID", Integer, primary_key=True,  index = True),
+                     Column("itemID", Integer, primary_key=True, index = True),
                      Column("attrID", Integer, primary_key=True, index = True),
                      Column("value", Float, nullable = False))
 

diff --git a/service/market.py b/service/market.py
@@ -707,7 +707,11 @@ def getItemsWithOverrides(self):
         overrides = eos.db.getAllOverrides()
         items = set()
         for x in overrides:
-            items.add(x.item)
+            if (x.item is None):
+                eos.db.saveddata_session.delete(x)
+                eos.db.commit()
+            else:
+                items.add(x.item)
         return list(items)
 
     def directAttrRequest(self, items, attribs):