Skip to content

Commit 93b1566

Browse files
authored
Fix: Fixed NullReferenceException with DefaultDestinationFolderPath (#13662)
1 parent e6108fc commit 93b1566

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/Files.App/Utils/Archives/DecompressHelper.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public static async Task DecompressArchiveAsync(IShellPage associatedInstance)
169169

170170
public static async Task DecompressArchiveHereAsync(IShellPage associatedInstance)
171171
{
172-
if (associatedInstance == null)
172+
if (associatedInstance?.SlimContentPage == null)
173173
return;
174174

175175
foreach (var selectedItem in associatedInstance.SlimContentPage.SelectedItems)
@@ -178,6 +178,9 @@ public static async Task DecompressArchiveHereAsync(IShellPage associatedInstanc
178178
BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(selectedItem.ItemPath);
179179
BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(associatedInstance.FilesystemViewModel.CurrentFolder.ItemPath);
180180

181+
if (archive is null)
182+
return;
183+
181184
if (await FilesystemTasks.Wrap(() => IsArchiveEncrypted(archive)))
182185
{
183186
DecompressArchiveDialog decompressArchiveDialog = new();
@@ -202,7 +205,7 @@ public static async Task DecompressArchiveHereAsync(IShellPage associatedInstanc
202205

203206
public static async Task DecompressArchiveToChildFolderAsync(IShellPage associatedInstance)
204207
{
205-
if (associatedInstance == null)
208+
if (associatedInstance?.SlimContentPage == null)
206209
return;
207210

208211
foreach (var selectedItem in associatedInstance.SlimContentPage.SelectedItems)
@@ -213,6 +216,9 @@ public static async Task DecompressArchiveToChildFolderAsync(IShellPage associat
213216
BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(associatedInstance.FilesystemViewModel.CurrentFolder.ItemPath);
214217
BaseStorageFolder destinationFolder = null;
215218

219+
if (archive is null)
220+
return;
221+
216222
if (await FilesystemTasks.Wrap(() => DecompressHelper.IsArchiveEncrypted(archive)))
217223
{
218224
DecompressArchiveDialog decompressArchiveDialog = new();

0 commit comments

Comments
 (0)