From 67b292ad86dc3bd93b5054a804d863cab7e61504 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Tue, 13 May 2025 17:57:54 +0800
Subject: [PATCH] fix: ensure upstream branch exists before updating filter

---
 src/ViewModels/Repository.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 8661cae26..a578285d7 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -927,7 +927,11 @@ public void SetBranchFilterMode(BranchTreeNode node, Models.FilterMode mode, boo
                     return;
 
                 if (isLocal && !string.IsNullOrEmpty(branch.Upstream))
-                    _settings.UpdateHistoriesFilter(branch.Upstream, Models.FilterType.RemoteBranch, mode);
+                {
+                    var upstreamNode = FindBranchNode(_remoteBranchTrees, branch.Upstream);
+                    if (upstreamNode != null)
+                        _settings.UpdateHistoriesFilter(branch.Upstream, Models.FilterType.RemoteBranch, mode);
+                }
             }
             else
             {