Fix: Avoid NullReferenceException in NavigationToolbarViewModel (#17610)

seer-by-sentry[bot] · web-flow · commit 2a154dc3cf46 · 2025-09-14T17:07:52.000-04:00
Co-authored-by: seer-by-sentry[bot] &lt;157164994+seer-by-sentry[bot]@users.noreply.github.com&gt;
diff --git a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
@@ -942,8 +942,14 @@ public async Task PopulateOmnibarSuggestionsForPathMode()
 			void AddNoResultsItem()
 			{
 				PathModeSuggestionItems.Clear();
+				
+				// Use null-safe access to avoid NullReferenceException during app lifecycle transitions
+				var workingDirectory = string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)
+					? Constants.UserEnvironmentPaths.HomePath
+					: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
+				
 				PathModeSuggestionItems.Add(new(
-					ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory,
+					workingDirectory,
 					Strings.NavigationToolbarVisiblePathNoResults.GetLocalizedResource()));
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -942,8 +942,14 @@ public async Task PopulateOmnibarSuggestionsForPathMode()`
`942`	`942`	`void AddNoResultsItem()`
`943`	`943`	`{`
`944`	`944`	`PathModeSuggestionItems.Clear();`
	`945`	`+`
	`946`	`+ // Use null-safe access to avoid NullReferenceException during app lifecycle transitions`
	`947`	`+ var workingDirectory = string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)`
	`948`	`+ ? Constants.UserEnvironmentPaths.HomePath`
	`949`	`+ : ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;`
	`950`	`+`
`945`	`951`	`PathModeSuggestionItems.Add(new(`
`946`		`- ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory,`
	`952`	`+ workingDirectory,`
`947`	`953`	`Strings.NavigationToolbarVisiblePathNoResults.GetLocalizedResource()));`
`948`	`954`	`}`
`949`	`955`	`}`