Fix multiple selection not removing all

Deadpikle · Nov 7, 2024 · 7b107c0 · 7b107c0
1 parent b1db9b8
commit 7b107c0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/EasyBackup/Views/ExcludeFilesFolders.xaml b/EasyBackup/Views/ExcludeFilesFolders.xaml
@@ -68,7 +68,7 @@
         <StackPanel Grid.Column="1" Grid.Row="2" Orientation="Vertical" Margin="5">
             <Button Content="Add File" Margin="0,5,0,5" Command="{Binding AddFile}"/>
             <Button Content="Add Folder" Margin="0,5,0,5" Command="{Binding AddFolder}"/>
-            <Button Content="Remove File/Folder" Margin="0,5,0,5" CommandParameter="{Binding ElementName=PathsDataGrid, Path=SelectedItems}" 
+            <Button Content="Remove File/Folder(s)" Margin="0,5,0,5" CommandParameter="{Binding ElementName=PathsDataGrid, Path=SelectedItems}" 
                     Command="{Binding RemoveItem}" IsEnabled="{Binding IsItemSelected}"/>
             <Button Content="Remove All Items" Margin="0,5,0,5" Command="{Binding RemoveAllItems}"/>
         </StackPanel>

diff --git a/EasyBackupAvalonia/ViewModels/ExcludeFilesFoldersViewModel.cs b/EasyBackupAvalonia/ViewModels/ExcludeFilesFoldersViewModel.cs
@@ -145,8 +145,8 @@ private void RemoveItemFromList(object items)
             if (items != null)
             {
                 System.Collections.IList list = (System.Collections.IList)items;
-                var selection = list?.Cast<FolderFileItem>();
-                for (int i = 0; i < selection.Count(); i++)
+                var selection = list?.Cast<FolderFileItem>().ToArray();
+                for (int i = 0; i < selection.Length; i++)
                 {
                     Items.Remove(selection.ElementAt(i));
                 }

diff --git a/EasyBackupAvalonia/ViewModels/SetupBackupViewModel.cs b/EasyBackupAvalonia/ViewModels/SetupBackupViewModel.cs
@@ -243,8 +243,8 @@ private void RemoveItemFromList(object items)
             if (items != null)
             {
                 System.Collections.IList list = (System.Collections.IList)items;
-                var selection = list?.Cast<FolderFileItem>();
-                for (int i = 0; i < selection.Count(); i++)
+                var selection = list?.Cast<FolderFileItem>().ToArray();
+                for (int i = 0; i < selection.Length; i++)
                 {
                     Items.Remove(selection.ElementAt(i));
                 }

diff --git a/EasyBackupAvalonia/Views/SetupBackup.axaml b/EasyBackupAvalonia/Views/SetupBackup.axaml
@@ -105,7 +105,7 @@
             <Button Content="Add Folder"
                     Margin="0,5,0,5"
                     Command="{Binding AddFolder}" />
-            <Button Content="Remove File/Folder"
+            <Button Content="Remove File/Folder(s)"
                     Margin="0,5,0,5"
                     CommandParameter="{Binding ElementName=PathsDataGrid, Path=SelectedItems}"
                     Command="{Binding RemoveItem}"