From c4eb60f3a1e56d7daceaa2e474a6484dbb56eada Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 9 Nov 2019 11:13:46 +0800
Subject: [PATCH] Merge pull request #3232 from
 AvaloniaUI/prevent-filename-cleared-managed-file-dialog

Backport of ManagedFileDialogFix from Wasabi Wallet
---
 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..189e13802d 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;
+						    }
                         }
                     }
                 }