Fix: Fixed crash that would occur when trying to display tags (#12764)

files-community · Jun 27, 2023 · 3f50186 · 3f50186
1 parent 2dcf58a
commit 3f50186
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Files.App/Filesystem/FileTagsHelper.cs b/src/Files.App/Filesystem/FileTagsHelper.cs
@@ -26,7 +26,7 @@ public static class FileTagsHelper
 		public static string[] ReadFileTag(string filePath)
 		{
 			var tagString = NativeFileOperationsHelper.ReadStringFromFile($"{filePath}:files");
-			return tagString?.Split(',');
+			return tagString?.Split(',', StringSplitOptions.RemoveEmptyEntries);
 		}
 
 		public static void WriteFileTag(string filePath, string[] tag)

diff --git a/src/Files.App/Services/Settings/FileTagsSettingsService.cs b/src/Files.App/Services/Settings/FileTagsSettingsService.cs
@@ -80,7 +80,7 @@ public TagViewModel GetTagById(string uid)
 
 		public IList<TagViewModel> GetTagsByIds(string[] uids)
 		{
-			return uids?.Select(x => GetTagById(x)).ToList();
+			return uids?.Select(x => GetTagById(x)).Where(x => x is not null).ToList();
 		}
 
 		public IEnumerable<TagViewModel> GetTagsByName(string tagName)