Fix: Fixed crash when reordering sidebar favorites (#13599)

Author: hishitetsu

src/Files.App/Services/QuickAccessService.cs

@@ -17,27 +17,25 @@ public async Task<IEnumerable<ShellFileItem>> GetPinnedFoldersAsync()
 			return result;
 		}
 
-		public Task PinToSidebarAsync(string folderPath)
-		{ 
-			return PinToSidebarAsync(new[] { folderPath });
-		}
-		
-		public async Task PinToSidebarAsync(string[] folderPaths)
+		public Task PinToSidebarAsync(string folderPath) => PinToSidebarAsync(new[] { folderPath });
+
+		public Task PinToSidebarAsync(string[] folderPaths) => PinToSidebarAsync(folderPaths, true);
+
+		private async Task PinToSidebarAsync(string[] folderPaths, bool doUpdateQuickAccessWidget)
 		{
 			foreach (string folderPath in folderPaths)
 				await ContextMenu.InvokeVerb("pintohome", new[] {folderPath});
 
 			await App.QuickAccessManager.Model.LoadAsync();
-			
-			App.QuickAccessManager.UpdateQuickAccessWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, true));
+			if (doUpdateQuickAccessWidget)
+				App.QuickAccessManager.UpdateQuickAccessWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, true));
 		}
 
-		public Task UnpinFromSidebarAsync(string folderPath)
-		{ 
-			return UnpinFromSidebarAsync(new[] { folderPath }); 
-		}
-		
-		public async Task UnpinFromSidebarAsync(string[] folderPaths)
+		public Task UnpinFromSidebarAsync(string folderPath) => UnpinFromSidebarAsync(new[] { folderPath }); 
+
+		public Task UnpinFromSidebarAsync(string[] folderPaths) => UnpinFromSidebarAsync(folderPaths, true);
+
+		private async Task UnpinFromSidebarAsync(string[] folderPaths, bool doUpdateQuickAccessWidget)
 		{
 			Type? shellAppType = Type.GetTypeFromProgID("Shell.Application");
 			object? shell = Activator.CreateInstance(shellAppType);
@@ -76,8 +74,8 @@ await SafetyExtensions.IgnoreExceptions(async () =>
 			}
 
 			await App.QuickAccessManager.Model.LoadAsync();
-			
-			App.QuickAccessManager.UpdateQuickAccessWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, false));
+			if (doUpdateQuickAccessWidget)
+				App.QuickAccessManager.UpdateQuickAccessWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, false));
 		}
 
 		public bool IsItemPinned(string folderPath)
@@ -93,11 +91,15 @@ public async Task SaveAsync(string[] items)
 			App.QuickAccessManager.PinnedItemsWatcher.EnableRaisingEvents = false;
 
 			// Unpin every item that is below this index and then pin them all in order
-			await UnpinFromSidebarAsync(Array.Empty<string>());
+			await UnpinFromSidebarAsync(Array.Empty<string>(), false);
 
-			await PinToSidebarAsync(items);
+			await PinToSidebarAsync(items, false);
 			App.QuickAccessManager.PinnedItemsWatcher.EnableRaisingEvents = true;
-			await App.QuickAccessManager.Model.LoadAsync();
+
+			App.QuickAccessManager.UpdateQuickAccessWidget?.Invoke(this, new ModifyQuickAccessEventArgs(items, true)
+			{
+				Reorder = true
+			});
 		}
 	}
 }

src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs

@@ -31,6 +31,7 @@ public class ModifyQuickAccessEventArgs : EventArgs
 		public bool Add;
 		public bool Pin = true;
 		public bool Reset = false;
+		public bool Reorder = false;
 
 		public ModifyQuickAccessEventArgs(string[] paths, bool add)
 		{
@@ -261,6 +262,28 @@ await DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 
 					return;
 				}
+				if (e.Reorder)
+				{
+					// Remove pinned items
+					foreach (var itemToRemove in ItemsAdded.Where(x => x.IsPinned).ToList())
+						ItemsAdded.Remove(itemToRemove);
+
+					// Add pinned items in the new order
+					foreach (var itemToAdd in e.Paths)
+					{
+						var item = await App.QuickAccessManager.Model.CreateLocationItemFromPathAsync(itemToAdd);
+						var lastIndex = ItemsAdded.IndexOf(ItemsAdded.FirstOrDefault(x => !x.IsPinned));
+						if (ItemsAdded.Any(x => x.Path == itemToAdd))
+							continue;
+
+						ItemsAdded.Insert(lastIndex >= 0 ? lastIndex : ItemsAdded.Count, new FolderCardItem(item, Path.GetFileName(item.Text), true)
+						{
+							Path = item.Path,
+						});
+					}
+
+					return;
+				}
 				if (e.Add)
 				{
 					foreach (var itemToAdd in e.Paths)