From 6bb0938be04bb42771bb4ab454d2949b2792e839 Mon Sep 17 00:00:00 2001 From: PhatPhuckDave Date: Sun, 7 Dec 2025 14:32:30 +0100 Subject: [PATCH] Fix ammo filtering --- gui/builtinMarketBrowser/itemView.py | 2 +- gui/marketBrowser.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py index 824f54db8..ff31a7abb 100644 --- a/gui/builtinMarketBrowser/itemView.py +++ b/gui/builtinMarketBrowser/itemView.py @@ -166,7 +166,7 @@ class ItemView(Display): self.updateItemStore(items) self.filterItemStore() return - + # If "Fits" filter is active, re-filter the current view if self.marketBrowser.getFitsFilter(): self.filterItemStore() diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 3753dff45..6df9c6454 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -54,6 +54,7 @@ class MarketBrowser(wx.Panel): self.settings = MarketPriceSettings.getInstance() self.__mode = 'normal' self.__normalBtnMap = {} + self.__normalSlotBtnMap = {} self.marketView = MarketTree(self.splitter, self) self.itemView = ItemView(self.splitter, self) @@ -216,6 +217,9 @@ class MarketBrowser(wx.Panel): self.__normalBtnMap.clear() for btn in self.metaButtons: self.__normalBtnMap[btn] = btn.userSelected + self.__normalSlotBtnMap.clear() + for btn in self.slotButtons: + self.__normalSlotBtnMap[btn] = btn.userSelected if newMode == 'search': self.marketView.UnselectAll() setting = self.settings.get('marketMGSearchMode') @@ -224,9 +228,14 @@ class MarketBrowser(wx.Panel): if newMode in ('search', 'recent', 'charges'): for btn in self.metaButtons: btn.setUserSelection(True) + # Clear slot button selections when searching (search can return any item type) + for btn in self.slotButtons: + btn.setUserSelection(False) if newMode == 'normal': for btn, state in self.__normalBtnMap.items(): btn.setUserSelection(state) + for btn, state in self.__normalSlotBtnMap.items(): + btn.setUserSelection(state) # We turn on all meta buttons permanently if setting == 2: for btn in self.metaButtons: