Update ShellViewModel.cs

yaira2 · yaira2 · commit 969bd6d5af2e · 2025-07-28T18:13:49.000-04:00
diff --git a/src/Files.App/ViewModels/ShellViewModel.cs b/src/Files.App/ViewModels/ShellViewModel.cs
@@ -766,10 +766,10 @@ private void FilesAndFolderFilterUpdated()
 
 		private void ClearFilesAndFolderFilter()
 		{
-			FilesAndFoldersFilter = null;
-
-			if (UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
+			if (!string.IsNullOrEmpty(FilesAndFoldersFilter) && UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
 				UserSettingsService.GeneralSettingsService.ShowFilterHeader = false;
+
+			FilesAndFoldersFilter = null;
 		}
 
 		// Apply changes immediately after manipulating on filesAndFolders completed

Original file line number	Diff line number	Diff line change
`@@ -766,10 +766,10 @@ private void FilesAndFolderFilterUpdated()`
`766`	`766`
`767`	`767`	`private void ClearFilesAndFolderFilter()`
`768`	`768`	`{`
`769`		`- FilesAndFoldersFilter = null;`
`770`		`-`
`771`		`- if (UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)`
	`769`	`+ if (!string.IsNullOrEmpty(FilesAndFoldersFilter) && UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)`
`772`	`770`	`UserSettingsService.GeneralSettingsService.ShowFilterHeader = false;`
	`771`	`+`
	`772`	`+ FilesAndFoldersFilter = null;`
`773`	`773`	`}`
`774`	`774`
`775`	`775`	`// Apply changes immediately after manipulating on filesAndFolders completed`