From 684216c6e9c405480482cc803f719473a1e08f74 Mon Sep 17 00:00:00 2001 From: danwalmsley Date: Fri, 8 Nov 2019 22:32:24 +0000 Subject: [PATCH 1/2] Update ManagedFileChooserViewModel.cs --- src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs b/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs index 03e05e7a75..94cf3cbf6a 100644 --- a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs +++ b/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs @@ -210,7 +210,12 @@ namespace Avalonia.Dialogs if (!_selectingDirectory) { - FileName = SelectedItems.FirstOrDefault()?.DisplayName; + var selectedItem = SelectedItems.FirstOrDefault(); + + if (selectedItem != null) + { + FileName = selectedItem.DisplayName; + } } } } From aea400c6ae07af6c79b4e399ebac5c188b5cd070 Mon Sep 17 00:00:00 2001 From: danwalmsley Date: Fri, 8 Nov 2019 22:34:54 +0000 Subject: [PATCH 2/2] fix spacing. --- src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs b/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs index 94cf3cbf6a..189e13802d 100644 --- a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs +++ b/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs @@ -212,10 +212,10 @@ namespace Avalonia.Dialogs { var selectedItem = SelectedItems.FirstOrDefault(); - if (selectedItem != null) - { - FileName = selectedItem.DisplayName; - } + if (selectedItem != null) + { + FileName = selectedItem.DisplayName; + } } } }