Update JsonNavigationService.cs

ghost1372 · Dec 26, 2024 · 43dc6ad · 43dc6ad
1 parent a9f70d9
commit 43dc6ad
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/...vWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.cs b/...vWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.cs
@@ -48,14 +48,11 @@ private void OnNavigated(object sender, NavigationEventArgs e)
                 return;
             }
 
-            if (e.Parameter is BaseDataInfo dataInfo)
+            if (e.Parameter is BaseDataInfo dataInfo && dataInfo != null)
             {
-                if (!string.IsNullOrEmpty(dataInfo.UniqueId))
+                if (e.NavigationMode == NavigationMode.Back || !currentTag.Equals(dataInfo.UniqueId))
                 {
-                    if (e.NavigationMode == NavigationMode.Back || !currentTag.Equals(dataInfo.UniqueId))
-                    {
-                        EnsureNavigationSelection(dataInfo.UniqueId);
-                    }
+                    EnsureNavigationSelection(dataInfo.UniqueId);
                 }
             }
         }