Skip to content

Commit d372c01

Browse files
committed
Fix crash when Filters.csv is empty (#745)
Closes #745
1 parent dabaca6 commit d372c01

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

EverythingToolbar/Helpers/FilterLoader.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,15 @@ public ObservableCollection<Filter> Filters
1414
if (ToolbarSettings.User.IsRegExEnabled)
1515
return new ObservableCollection<Filter>([DefaultFilterLoader.AllFilter]);
1616

17-
if (ToolbarSettings.User.IsImportFilters && EverythingFilterLoader.Instance.Filters != null)
18-
return EverythingFilterLoader.Instance.Filters;
17+
if (ToolbarSettings.User.IsImportFilters)
18+
{
19+
var everythingFilters = EverythingFilterLoader.Instance.Filters;
20+
21+
if (everythingFilters?.Count > 0)
22+
return everythingFilters;
23+
24+
return new ObservableCollection<Filter>([DefaultFilterLoader.AllFilter]);
25+
}
1926

2027
return DefaultFilterLoader.Instance.Filters;
2128
}

0 commit comments

Comments
 (0)