Be even smarter about filtering

This commit is contained in:
Matt Nadareski
2025-05-14 13:37:45 -04:00
parent 95840a8146
commit 940b4932ca

View File

@@ -61,19 +61,28 @@ namespace SabreTools.DatTools
break; break;
case MergingFlag.Split: case MergingFlag.Split:
if (filterRunner != null) if (filterRunner != null)
{
datFile.ExecuteFilters(filterRunner); datFile.ExecuteFilters(filterRunner);
datFile.ClearMarked();
}
datFile.ApplySplit(); datFile.ApplySplit();
break; break;
case MergingFlag.Merged: case MergingFlag.Merged:
if (filterRunner != null) if (filterRunner != null)
{
datFile.ExecuteFilters(filterRunner); datFile.ExecuteFilters(filterRunner);
datFile.ClearMarked();
}
datFile.ApplyMerged(); datFile.ApplyMerged();
break; break;
case MergingFlag.NonMerged: case MergingFlag.NonMerged:
if (filterRunner != null) if (filterRunner != null)
{
datFile.ExecuteFilters(filterRunner); datFile.ExecuteFilters(filterRunner);
datFile.ClearMarked();
}
datFile.ApplyNonMerged(); datFile.ApplyNonMerged();
break; break;
@@ -81,7 +90,10 @@ namespace SabreTools.DatTools
// Nonstandard // Nonstandard
case MergingFlag.FullMerged: case MergingFlag.FullMerged:
if (filterRunner != null) if (filterRunner != null)
{
datFile.ExecuteFilters(filterRunner); datFile.ExecuteFilters(filterRunner);
datFile.ClearMarked();
}
datFile.ApplyFullyMerged(); datFile.ApplyFullyMerged();
break; break;