sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed bug in ShellFileOperations when supplying multiple files at once causing an endless loop

pull/164/head
dahall 2020-08-31 10:42:13 -06:00
parent c4fe7fc598
commit 58ab52cba6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Windows.Shell/ShellFileOperations/ShellFileOperations.cs
View File

@ -448,7 +448,7 @@ namespace Vanara.Windows.Shell
public void QueueApplyPropertiesOperation(IEnumerable<ShellItem> items, ShellItemPropertyUpdates props)
{
op.SetProperties(props.IPropertyChangeArray);
op.ApplyPropertiesToItems(GetSHArray(items));
op.ApplyPropertiesToItems(GetSHArray(items).IShellItemArray);
QueuedOperations++;
}
@ -472,7 +472,7 @@ namespace Vanara.Windows.Shell
/// <param name="dest">A <see cref="ShellFolder"/> that specifies the destination folder to contain the copy of the items.</param>
public void QueueCopyOperation(IEnumerable<ShellItem> sourceItems, ShellFolder dest)
{
op.CopyItems(GetSHArray(sourceItems), dest.IShellItem);
op.CopyItems(GetSHArray(sourceItems).IShellItemArray, dest.IShellItem);
QueuedOperations++;
}
@ -490,7 +490,7 @@ namespace Vanara.Windows.Shell
/// </param>
public void QueueDeleteOperation(IEnumerable<ShellItem> items)
{
op.DeleteItems(GetSHArray(items));
op.DeleteItems(GetSHArray(items).IShellItemArray);
QueuedOperations++;
}
@ -514,7 +514,7 @@ namespace Vanara.Windows.Shell
/// <param name="dest">A <see cref="ShellFolder"/> that specifies the destination folder to contain the moved items.</param>
public void QueueMoveOperation(IEnumerable<ShellItem> sourceItems, ShellFolder dest)
{
op.MoveItems(GetSHArray(sourceItems), dest.IShellItem);
op.MoveItems(GetSHArray(sourceItems).IShellItemArray, dest.IShellItem);
QueuedOperations++;
}
@ -563,7 +563,7 @@ namespace Vanara.Windows.Shell
/// <param name="newName">The new display name of the items.</param>
public void QueueRenameOperation(IEnumerable<ShellItem> sourceItems, string newName)
{
op.RenameItems(GetSHArray(sourceItems), newName);
op.RenameItems(GetSHArray(sourceItems).IShellItemArray, newName);
QueuedOperations++;
}
@ -590,7 +590,7 @@ namespace Vanara.Windows.Shell
}
}
private IShellItemArray GetSHArray(IEnumerable<ShellItem> items) => items is ShellItemArray a ? a.IShellItemArray : GetSHArray(items);
private ShellItemArray GetSHArray(IEnumerable<ShellItem> items) => items is ShellItemArray a ? a : new ShellItemArray(items);
private class OpSink : IFileOperationProgressSink
{