Skip to content

Commit c41ec3d

Browse files
authored
Fix: Fixed NullReferenceException with OpenPropertiesWindow (#13748)
1 parent c0ed63b commit c41ec3d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/Files.App/Utils/Storage/Helpers/FilePropertiesHelpers.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,15 @@ public static nint GetWindowHandle(Window w)
4141
/// <param name="associatedInstance">Associated main window instance</param>
4242
public static void OpenPropertiesWindow(IShellPage associatedInstance)
4343
{
44+
if (associatedInstance is null)
45+
return;
46+
4447
object item;
4548

4649
var page = associatedInstance.SlimContentPage;
4750

4851
// Item(s) selected
49-
if (page.IsItemSelected)
52+
if (page is not null && page.IsItemSelected)
5053
{
5154
// Selected item(s)
5255
item = page.SelectedItems?.Count is 1
@@ -57,7 +60,7 @@ public static void OpenPropertiesWindow(IShellPage associatedInstance)
5760
else
5861
{
5962
// Instance's current folder
60-
var folder = associatedInstance.FilesystemViewModel.CurrentFolder;
63+
var folder = associatedInstance.FilesystemViewModel?.CurrentFolder;
6164
if (folder is null)
6265
return;
6366

0 commit comments

Comments
 (0)