From 3efa07d82128b8b5a10af785abfa9ac14a6f8d08 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 20 Apr 2019 23:16:25 +0300 Subject: [PATCH] When changing charges, check not just market group, but group too --- gui/builtinContextMenus/moduleAmmoChange.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gui/builtinContextMenus/moduleAmmoChange.py b/gui/builtinContextMenus/moduleAmmoChange.py index cd4c1bc1c..d1f8ead3d 100644 --- a/gui/builtinContextMenus/moduleAmmoChange.py +++ b/gui/builtinContextMenus/moduleAmmoChange.py @@ -236,6 +236,7 @@ class ChangeModuleAmmo(ContextMenu): return sMkt = Market.getInstance() selectedModule = self.modules[0] + mainGroupID = getattr(sMkt.getGroupByItem(selectedModule.item), 'ID', None) mainMktGroupID = getattr(sMkt.getMarketGroupByItem(selectedModule.item), 'ID', None) positions = [] for position, mod in enumerate(modContainer): @@ -249,9 +250,13 @@ class ChangeModuleAmmo(ContextMenu): if mod.itemID == selectedModule.itemID: positions.append(position) continue - # And modules from the same market group too + # And modules from the same group and market group too + modGroupID = getattr(sMkt.getGroupByItem(mod.item), 'ID', None) modMktGroupID = getattr(sMkt.getMarketGroupByItem(mod.item), 'ID', None) - if modMktGroupID is not None and modMktGroupID == mainMktGroupID: + if ( + modGroupID is not None and modGroupID == mainGroupID and + modMktGroupID is not None and modMktGroupID == mainMktGroupID + ): positions.append(position) continue self.mainFrame.command.Submit(command(