From db82e73697308327f5db0f698b0dd7a733b60e53 Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Wed, 7 Jun 2023 16:37:43 +0200 Subject: [PATCH] feat: TryGetFolderFromPathAsync return null instead of throw exception when empty folder path --- .../Storage/FileIO/StorageProviderHelpers.cs | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs b/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs index 55aac6f3fa..76323eb900 100644 --- a/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs +++ b/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs @@ -10,16 +10,19 @@ internal static class StorageProviderHelpers { public static IStorageItem? TryCreateBclStorageItem(string path) { - var directory = new DirectoryInfo(path); - if (directory.Exists) + if (!string.IsNullOrWhiteSpace(path)) { - return new BclStorageFolder(directory); - } - - var file = new FileInfo(path); - if (file.Exists) - { - return new BclStorageFile(file); + var directory = new DirectoryInfo(path); + if (directory.Exists) + { + return new BclStorageFolder(directory); + } + + var file = new FileInfo(path); + if (file.Exists) + { + return new BclStorageFile(file); + } } return null;