Fix: Fixed NullReferenceException in DirectoryInfoUpdated (#14720)

hishitetsu · web-flow · commit c6ad49c50b9c · 2024-02-13T20:29:28.000-08:00
diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
@@ -270,16 +270,20 @@ protected async void FilesystemViewModel_DirectoryInfoUpdated(object sender, Eve
 				}
 			}
 
+			var contentPage = ContentPage;
+			if (contentPage is null)
+				return;
+
 			if (!GitHelpers.IsExecutingGitAction)
 			{
-				ContentPage.DirectoryPropertiesViewModel.UpdateGitInfo(
+				contentPage.DirectoryPropertiesViewModel.UpdateGitInfo(
 					InstanceViewModel.IsGitRepository,
 					InstanceViewModel.GitRepositoryPath,
 					headBranch);
 			}
 
-			ContentPage.DirectoryPropertiesViewModel.DirectoryItemCount = $"{FilesystemViewModel.FilesAndFolders.Count} {directoryItemCountLocalization}";
-			ContentPage.UpdateSelectionSize();
+			contentPage.DirectoryPropertiesViewModel.DirectoryItemCount = $"{FilesystemViewModel.FilesAndFolders.Count} {directoryItemCountLocalization}";
+			contentPage.UpdateSelectionSize();
 		}
 
 		protected async void FilesystemViewModel_GitDirectoryUpdated(object sender, EventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -270,16 +270,20 @@ protected async void FilesystemViewModel_DirectoryInfoUpdated(object sender, Eve`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`
	`273`	`+ var contentPage = ContentPage;`
	`274`	`+ if (contentPage is null)`
	`275`	`+ return;`
	`276`	`+`
`273`	`277`	`if (!GitHelpers.IsExecutingGitAction)`
`274`	`278`	`{`
`275`		`- ContentPage.DirectoryPropertiesViewModel.UpdateGitInfo(`
	`279`	`+ contentPage.DirectoryPropertiesViewModel.UpdateGitInfo(`
`276`	`280`	`InstanceViewModel.IsGitRepository,`
`277`	`281`	`InstanceViewModel.GitRepositoryPath,`
`278`	`282`	`headBranch);`
`279`	`283`	`}`
`280`	`284`
`281`		`- ContentPage.DirectoryPropertiesViewModel.DirectoryItemCount = $"{FilesystemViewModel.FilesAndFolders.Count} {directoryItemCountLocalization}";`
`282`		`- ContentPage.UpdateSelectionSize();`
	`285`	`+ contentPage.DirectoryPropertiesViewModel.DirectoryItemCount = $"{FilesystemViewModel.FilesAndFolders.Count} {directoryItemCountLocalization}";`
	`286`	`+ contentPage.UpdateSelectionSize();`
`283`	`287`	`}`
`284`	`288`
`285`	`289`	`protected async void FilesystemViewModel_GitDirectoryUpdated(object sender, EventArgs e)`