From 8bb3cbb25e92dd341a445bcf1313f3299ed6d929 Mon Sep 17 00:00:00 2001
From: blitzmann <holmes.ryan.90@gmail.com>
Date: Thu, 31 May 2018 21:20:47 -0400
Subject: [PATCH] More icon fixes

---
 eos/saveddata/module.py                     | 2 +-
 eos/saveddata/ship.py                       | 2 +-
 gui/builtinContextMenus/moduleAmmoPicker.py | 2 +-
 gui/builtinViewColumns/ammoIcon.py          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index 41bed8c50..ca9f7cd13 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -575,7 +575,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
         for i in range(5):
             itemChargeGroup = self.getModifiedItemAttr('chargeGroup' + str(i), None)
             if itemChargeGroup is not None:
-                g = eos.db.getGroup(int(itemChargeGroup), eager=("items.icon", "items.attributes"))
+                g = eos.db.getGroup(int(itemChargeGroup), eager=("items.attributes"))
                 if g is None:
                     continue
                 for singleItem in g.items:
diff --git a/eos/saveddata/ship.py b/eos/saveddata/ship.py
index 56b3f7c0d..1e1dd30d6 100644
--- a/eos/saveddata/ship.py
+++ b/eos/saveddata/ship.py
@@ -131,7 +131,7 @@ class Ship(ItemAttrShortcut, HandledItem):
             return None
 
         items = []
-        g = eos.db.getGroup("Ship Modifiers", eager=("items.icon", "items.attributes"))
+        g = eos.db.getGroup("Ship Modifiers", eager=("items.attributes"))
         for item in g.items:
             # Rely on name detection because race is not reliable
             if item.name.lower().startswith(self.item.name.lower()):
diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py
index 44729e6cc..93ff48754 100644
--- a/gui/builtinContextMenus/moduleAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleAmmoPicker.py
@@ -117,7 +117,7 @@ class ModuleAmmoPicker(ContextMenu):
         item = wx.MenuItem(menu, id_, name)
         menu.Bind(wx.EVT_MENU, self.handleAmmoSwitch, item)
         item.charge = charge
-        if charge is not None and charge.icon is not None:
+        if charge is not None and charge.iconID is not None:
             bitmap = BitmapLoader.getBitmap(charge.iconID, "icons")
             if bitmap is not None:
                 item.SetBitmap(bitmap)
diff --git a/gui/builtinViewColumns/ammoIcon.py b/gui/builtinViewColumns/ammoIcon.py
index be9617598..647d235a0 100644
--- a/gui/builtinViewColumns/ammoIcon.py
+++ b/gui/builtinViewColumns/ammoIcon.py
@@ -43,7 +43,7 @@ class AmmoIcon(ViewColumn):
         if stuff.charge is None:
             return -1
         else:
-            iconFile = stuff.charge.iconID if stuff.charge.icon else ""
+            iconFile = stuff.charge.iconID if stuff.charge.iconID else ""
             if iconFile:
                 return self.fittingView.imageList.GetImageIndex(iconFile, "icons")
             else: