Fix: Fixed issue where items couldn't be dropped from 7-zip (#14918)

hishitetsu · web-flow · commit 302161c31619 · 2024-03-08T07:38:01.000-08:00
diff --git a/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs b/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs
@@ -170,8 +170,17 @@ public async Task DropAsync(DragEventArgs e)
 
 			if (FilesystemHelpers.HasDraggedStorageItems(e.DataView))
 			{
-				await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.DataView, _associatedInstance.FilesystemViewModel.WorkingDirectory, false, true);
-				await _associatedInstance.RefreshIfNoWatcherExistsAsync();
+				var deferral = e.GetDeferral();
+
+				try
+				{
+					await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.DataView, _associatedInstance.FilesystemViewModel.WorkingDirectory, false, true);
+					await _associatedInstance.RefreshIfNoWatcherExistsAsync();
+				}
+				finally
+				{
+					deferral.Complete();
+				}
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,17 @@ public async Task DropAsync(DragEventArgs e)`
`170`	`170`
`171`	`171`	`if (FilesystemHelpers.HasDraggedStorageItems(e.DataView))`
`172`	`172`	`{`
`173`		`- await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.DataView, _associatedInstance.FilesystemViewModel.WorkingDirectory, false, true);`
`174`		`- await _associatedInstance.RefreshIfNoWatcherExistsAsync();`
	`173`	`+ var deferral = e.GetDeferral();`
	`174`	`+`
	`175`	`+ try`
	`176`	`+ {`
	`177`	`+ await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.DataView, _associatedInstance.FilesystemViewModel.WorkingDirectory, false, true);`
	`178`	`+ await _associatedInstance.RefreshIfNoWatcherExistsAsync();`
	`179`	`+ }`
	`180`	`+ finally`
	`181`	`+ {`
	`182`	`+ deferral.Complete();`
	`183`	`+ }`
`175`	`184`	`}`
`176`	`185`	`}`
`177`	`186`