Fix: Fixed crash that would occur when deleting or restoring files (#…

…13195)
files-community · Aug 14, 2023 · 6e37d69 · 6e37d69
1 parent 001e8eb
commit 6e37d69
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/Files.App/Data/Items/LocationItem.cs b/src/Files.App/Data/Items/LocationItem.cs
@@ -87,7 +87,7 @@ public bool IsExpanded
 		public bool IsHeader { get; set; }
 
 		private object toolTip = "";
-		public object ToolTip
+		public virtual object ToolTip
 		{
 			get => toolTip;
 			set
@@ -109,7 +109,10 @@ public class RecycleBinLocationItem : LocationItem
 	{
 		public void RefreshSpaceUsed(object sender, FileSystemEventArgs e)
 		{
-			SpaceUsed = RecycleBinHelpers.GetSize();
+			MainWindow.Instance.DispatcherQueue.TryEnqueue(() =>
+			{
+				SpaceUsed = RecycleBinHelpers.GetSize();
+			});
 		}
 
 		private ulong spaceUsed;
@@ -118,10 +121,16 @@ public ulong SpaceUsed
 			get => spaceUsed;
 			set
 			{
-				SetProperty(ref spaceUsed, value);
+				if (SetProperty(ref spaceUsed, value))
+					OnPropertyChanged(nameof(ToolTip));
 			}
 		}
 
+		public override object ToolTip
+		{
+			get => SpaceUsed.ToSizeString();
+		}
+
 		public RecycleBinLocationItem()
 		{
 			SpaceUsed = RecycleBinHelpers.GetSize();

diff --git a/src/Files.App/Data/Models/SidebarPinnedModel.cs b/src/Files.App/Data/Models/SidebarPinnedModel.cs
@@ -97,11 +97,6 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)
 			locationItem.IsDefaultLocation = false;
 			locationItem.Text = res.Result?.DisplayName ?? Path.GetFileName(path.TrimEnd('\\'));
 
-			if(locationItem is RecycleBinLocationItem recycleBinItem)
-			{
-				recycleBinItem.ToolTip = recycleBinItem.SpaceUsed.ToSizeString();
-			}
-
 			if (res || (FilesystemResult)FolderHelpers.CheckFolderAccessWithWin32(path))
 			{
 				locationItem.IsInvalid = false;