claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix device and slot option filtering

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-07 10:42:23 -07:00
parent 90c3292637
commit e330d02b1a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SabreTools.Library/Filtering/Filter.cs
View File

@@ -1029,13 +1029,13 @@ namespace SabreTools.Library.Filtering
return false; return false;
// Filter on devices // Filter on devices
if (item.Devices != null) if (item.Devices != null && item.Devices.Any())
{ {
bool anyPositiveDevice = false; bool anyPositiveDevice = false;
bool anyNegativeDevice = false; bool anyNegativeDevice = false;
foreach (string device in item.Devices) foreach (string device in item.Devices)
{ {
anyPositiveDevice |= this.Devices.MatchesPositiveSet(device) == true; anyPositiveDevice |= this.Devices.MatchesPositiveSet(device) != false;
anyNegativeDevice |= this.Devices.MatchesNegativeSet(device) == false; anyNegativeDevice |= this.Devices.MatchesNegativeSet(device) == false;
} }
@@ -1044,14 +1044,14 @@ namespace SabreTools.Library.Filtering
} }
// Filter on slot options // Filter on slot options
if (item.SlotOptions != null) if (item.SlotOptions != null && item.SlotOptions.Any())
{ {
bool anyPositiveSlotOption = false; bool anyPositiveSlotOption = false;
bool anyNegativeSlotOption = false; bool anyNegativeSlotOption = false;
foreach (string device in item.SlotOptions) foreach (string slotOption in item.SlotOptions)
{ {
anyPositiveSlotOption |= this.SlotOptions.MatchesPositiveSet(device) == true; anyPositiveSlotOption |= this.SlotOptions.MatchesPositiveSet(slotOption) != false;
anyNegativeSlotOption |= this.SlotOptions.MatchesNegativeSet(device) == false; anyNegativeSlotOption |= this.SlotOptions.MatchesNegativeSet(slotOption) == false;
} }
if (!anyPositiveSlotOption || anyNegativeSlotOption) if (!anyPositiveSlotOption || anyNegativeSlotOption)