From 0a76ec7db7a97d45d2ac06f5af7af3762e3692e0 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Mon, 4 Nov 2024 17:25:25 -0500
Subject: [PATCH] Fix: Fixed an issue where bulk rename didn't follow the
 selection order

---
 .../ViewModels/Dialogs/BulkRenameDialogViewModel.cs        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Files.App/ViewModels/Dialogs/BulkRenameDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/BulkRenameDialogViewModel.cs
index cf363bf90482..a2c1af56c60c 100644
--- a/src/Files.App/ViewModels/Dialogs/BulkRenameDialogViewModel.cs
+++ b/src/Files.App/ViewModels/Dialogs/BulkRenameDialogViewModel.cs
@@ -45,17 +45,18 @@ private async Task DoCommitRenameAsync()
 			if (context.ShellPage is null)
 				return;
 
-			await Task.WhenAll(context.SelectedItems.Select(item =>
+			foreach (ListedItem item in context.SelectedItems)
 			{
 				var itemType = item.PrimaryItemAttribute == StorageItemTypes.Folder ? FilesystemItemType.Directory : FilesystemItemType.File;
-				return context.ShellPage.FilesystemHelpers.RenameAsync(
+				await context.ShellPage.FilesystemHelpers.RenameAsync(
 					StorageHelpers.FromPathAndType(item.ItemPath, itemType),
 					FileName + item.FileExtension,
 					NameCollisionOption.GenerateUniqueName,
 					true,
 					false
 				);
-			}));
+			};
 		}
+
 	}
 }
\ No newline at end of file