From d648718de6bf909c3376a4a34b3b1f9f9b91a947 Mon Sep 17 00:00:00 2001 From: Sakari Orisi Date: Wed, 5 Dec 2012 21:46:16 +0100 Subject: [PATCH] Fix some market group handling breaking with the addition of the salvage drones market group (which CCP messed up) --- service/market.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/service/market.py b/service/market.py index 8dcf2a7fc..3bc403e01 100644 --- a/service/market.py +++ b/service/market.py @@ -534,8 +534,6 @@ class Market(): """If market group has any items, return true""" if mg and mg.ID in self.ITEMS_FORCEDMARKETGROUP_R: return True - elif mg.hasTypes: - return True elif len(mg.items) > 0: return True else: @@ -563,7 +561,11 @@ class Market(): # Do not request variations to make process faster # Pick random item and use its icon items = self.getItemsByMarketGroup(mg, vars=False) - item = items.pop() + try: + item = items.pop() + except KeyError: + return "" + return item.icon.iconFile if item.icon else "" elif self.getMarketGroupChildren(mg) > 0: kids = self.getMarketGroupChildren(mg)