From 1b5fda9874bb011804c5a34a04c2db92d20709ed Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Thu, 24 Jul 2025 15:35:53 -0400 Subject: [PATCH] Code Quality: Fixed Omnibar navigation in search results --- .../ViewModels/UserControls/NavigationToolbarViewModel.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs index e3b7b968c59f..2b1cd5fa52a3 100644 --- a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs @@ -500,12 +500,13 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync( public async Task HandleItemNavigationAsync(string path) { - if (ContentPageContext.ShellPage is null || PathComponents.LastOrDefault()?.Path is not { } currentPath) + if (ContentPageContext.ShellPage is null) return; + var currentPath = PathComponents.LastOrDefault()?.Path; var isFtp = FtpHelpers.IsFtpPath(path); var normalizedInput = NormalizePathInput(path, isFtp); - if (currentPath.Equals(normalizedInput, StringComparison.OrdinalIgnoreCase) || + if (currentPath is not null && currentPath.Equals(normalizedInput, StringComparison.OrdinalIgnoreCase) || string.IsNullOrWhiteSpace(normalizedInput)) return; @@ -534,7 +535,7 @@ public async Task HandleItemNavigationAsync(string path) else { normalizedInput = StorageFileExtensions.GetResolvedPath(normalizedInput, isFtp); - if (currentPath.Equals(normalizedInput, StringComparison.OrdinalIgnoreCase)) + if (currentPath is not null && currentPath.Equals(normalizedInput, StringComparison.OrdinalIgnoreCase)) return; var item = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(normalizedInput));