Fixed a bug when cancelling browser selection (#379)

DevToys-app · Feb 13, 2022 · aa8624a · aa8624a
1 parent b321b01
commit aa8624a
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/dev/impl/DevToys/UI/Controls/FileSelector.xaml.cs b/src/dev/impl/DevToys/UI/Controls/FileSelector.xaml.cs
@@ -247,13 +247,16 @@ private async void BrowseFoldersHyperlinkButton_Click(object sender, RoutedEvent
 
             folderPicker.FileTypeFilter.Add("*");
 
-            StorageFolder folder = await folderPicker.PickSingleFolderAsync();
+            StorageFolder? folder = await folderPicker.PickSingleFolderAsync();
 
-            foreach (StorageFile file in await folder.GetFilesAsync())
+            if (folder is not null)
             {
-                if (_allowedFileExtensions.Any(ext => string.Equals(ext, "*", StringComparison.Ordinal) || string.Equals(ext, file.FileType, StringComparison.OrdinalIgnoreCase)))
+                foreach (StorageFile file in await folder.GetFilesAsync())
                 {
-                    files.Add(file);
+                    if (_allowedFileExtensions.Any(ext => string.Equals(ext, "*", StringComparison.Ordinal) || string.Equals(ext, file.FileType, StringComparison.OrdinalIgnoreCase)))
+                    {
+                        files.Add(file);
+                    }
                 }
             }