fix: crashes when trying to close a repository with a action that is still running (#2289)

love-linger · love-linger · commit c1d08e29aa10 · 2026-04-21T11:30:55.000+08:00
- It's not necessary to implement `IDisposable` interface for class that only contains managed resources
- Do not clear fields of `Repository` and let system GC handle it

Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Models/Count.cs b/src/Models/Count.cs
@@ -1,19 +1,4 @@
-﻿using System;
-
-namespace SourceGit.Models
+﻿namespace SourceGit.Models
 {
-    public class Count : IDisposable
-    {
-        public int Value { get; set; } = 0;
-
-        public Count(int value)
-        {
-            Value = value;
-        }
-
-        public void Dispose()
-        {
-            // Ignore
-        }
-    }
+    public record Count(int Value);
 }
diff --git a/src/Models/RepositoryUIStates.cs b/src/Models/RepositoryUIStates.cs
@@ -246,11 +246,10 @@ public static RepositoryUIStates Load(string gitDir)
             return states;
         }
 
-        public void Unload(string lastCommitMessage)
+        public void Unload()
         {
             try
             {
-                LastCommitMessage = lastCommitMessage;
                 using var stream = File.Create(_file);
                 JsonSerializer.Serialize(stream, this, JsonCodeGen.Default.RepositoryUIStates);
             }
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
@@ -25,7 +25,7 @@ public CommitDetailSharedData()
         }
     }
 
-    public partial class CommitDetail : ObservableObject, IDisposable
+    public partial class CommitDetail : ObservableObject
     {
         public Repository Repository
         {
@@ -174,23 +174,6 @@ public CommitDetail(Repository repo, CommitDetailSharedData sharedData)
             WebLinks = Models.CommitLink.Get(repo.Remotes);
         }
 
-        public void Dispose()
-        {
-            _repo = null;
-            _commit = null;
-            _changes = null;
-            _visibleChanges = null;
-            _selectedChanges = null;
-            _signInfo = null;
-            _searchChangeFilter = null;
-            _diffContext = null;
-            _viewRevisionFileContent = null;
-            _cancellationSource = null;
-            _requestingRevisionFiles = false;
-            _revisionFiles = null;
-            _revisionFileSearchSuggestion = null;
-        }
-
         public void NavigateTo(string commitSHA)
         {
             _repo?.NavigateToCommit(commitSHA);
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
@@ -10,7 +10,7 @@
 
 namespace SourceGit.ViewModels
 {
-    public class Histories : ObservableObject, IDisposable
+    public class Histories : ObservableObject
     {
         public bool IsLoading
         {
@@ -89,7 +89,7 @@ public long NavigationId
             private set => SetProperty(ref _navigationId, value);
         }
 
-        public IDisposable DetailContext
+        public object DetailContext
         {
             get => _detailContext;
             set => SetProperty(ref _detailContext, value);
@@ -131,16 +131,6 @@ public Histories(Repository repo)
             _commitDetailSharedData = new CommitDetailSharedData();
         }
 
-        public void Dispose()
-        {
-            Commits = [];
-            _repo = null;
-            _graph = null;
-            _selectedCommit = null;
-            _detailContext?.Dispose();
-            _detailContext = null;
-        }
-
         public Models.BisectState UpdateBisectInfo()
         {
             var test = Path.Combine(_repo.GitDir, "BISECT_START");
@@ -454,7 +444,7 @@ public void CompareWithWorktree(Models.Commit commit)
         private Models.Commit _selectedCommit = null;
         private Models.Bisect _bisect = null;
         private long _navigationId = 0;
-        private IDisposable _detailContext = null;
+        private object _detailContext = null;
         private bool _ignoreSelectionChange = false;
 
         private GridLength _leftArea = new GridLength(1, GridUnitType.Star);
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -483,10 +483,14 @@ public void Open()
 
         public void Close()
         {
-            SelectedView = null; // Do NOT modify. Used to remove exists widgets for GC.Collect
-            Logs.Clear();
+            SelectedView = new Models.Null();
 
-            _uiStates.Unload(_workingCopy.CommitMessage);
+            var commitMessage = _workingCopy.CommitMessage;
+            if (!string.IsNullOrEmpty(commitMessage) && _workingCopy.InProgressContext != null)
+                File.WriteAllText(Path.Combine(GitDir, "MERGE_MSG"), commitMessage);
+
+            _uiStates.LastCommitMessage = commitMessage;
+            _uiStates.Unload();
 
             if (_cancellationRefreshBranches is { IsCancellationRequested: false })
                 _cancellationRefreshBranches.Cancel();
@@ -499,35 +503,8 @@ public void Close()
             if (_cancellationRefreshStashes is { IsCancellationRequested: false })
                 _cancellationRefreshStashes.Cancel();
 
-            _autoFetchTimer.Dispose();
-            _autoFetchTimer = null;
-
-            _settings = null;
-            _uiStates = null;
-            _historyFilterMode = Models.FilterMode.None;
-
             _watcher?.Dispose();
-            _histories.Dispose();
-            _workingCopy.Dispose();
-            _stashesPage.Dispose();
-            _searchCommitContext.Dispose();
-
-            _watcher = null;
-            _histories = null;
-            _workingCopy = null;
-            _stashesPage = null;
-
-            _localChangesCount = 0;
-            _stashesCount = 0;
-
-            _remotes.Clear();
-            _branches.Clear();
-            _localBranchTrees.Clear();
-            _remoteBranchTrees.Clear();
-            _tags.Clear();
-            _visibleTags = null;
-            _submodules.Clear();
-            _visibleSubmodules = null;
+            _autoFetchTimer.Dispose();
         }
 
         public void SendNotification(string message, bool isError = false)
diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs
@@ -8,7 +8,7 @@
 
 namespace SourceGit.ViewModels
 {
-    public class RevisionCompare : ObservableObject, IDisposable
+    public class RevisionCompare : ObservableObject
     {
         public bool IsLoading
         {
@@ -109,18 +109,6 @@ public RevisionCompare(Repository repo, Models.Commit startPoint, Models.Commit
             Refresh();
         }
 
-        public void Dispose()
-        {
-            _repo = null;
-            _startPoint = null;
-            _endPoint = null;
-            _changes?.Clear();
-            _visibleChanges?.Clear();
-            _selectedChanges?.Clear();
-            _searchFilter = null;
-            _diffContext = null;
-        }
-
         public void OpenChangeWithExternalDiffTool(Models.Change change)
         {
             var opt = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), change);
diff --git a/src/ViewModels/SearchCommitContext.cs b/src/ViewModels/SearchCommitContext.cs
@@ -7,7 +7,7 @@
 
 namespace SourceGit.ViewModels
 {
-    public class SearchCommitContext : ObservableObject, IDisposable
+    public class SearchCommitContext : ObservableObject
     {
         public int Method
         {
@@ -75,14 +75,6 @@ public SearchCommitContext(Repository repo)
             _repo = repo;
         }
 
-        public void Dispose()
-        {
-            _repo = null;
-            _suggestions?.Clear();
-            _results?.Clear();
-            _worktreeFiles?.Clear();
-        }
-
         public void ClearFilter()
         {
             Filter = string.Empty;
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
@@ -8,7 +8,7 @@
 
 namespace SourceGit.ViewModels
 {
-    public class StashesPage : ObservableObject, IDisposable
+    public class StashesPage : ObservableObject
     {
         public List<Models.Stash> Stashes
         {
@@ -125,18 +125,6 @@ public StashesPage(Repository repo)
             _repo = repo;
         }
 
-        public void Dispose()
-        {
-            _stashes?.Clear();
-            _changes?.Clear();
-            _selectedChanges?.Clear();
-            _untracked.Clear();
-
-            _repo = null;
-            _selectedStash = null;
-            _diffContext = null;
-        }
-
         public void ClearSearchFilter()
         {
             SearchFilter = string.Empty;
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
@@ -6,7 +6,7 @@
 
 namespace SourceGit.ViewModels
 {
-    public class WorkingCopy : ObservableObject, IDisposable
+    public class WorkingCopy : ObservableObject
     {
         public Repository Repository
         {
@@ -229,36 +229,6 @@ public WorkingCopy(Repository repo)
             _repo = repo;
         }
 
-        public void Dispose()
-        {
-            if (_inProgressContext != null && !string.IsNullOrEmpty(_commitMessage))
-                File.WriteAllText(Path.Combine(_repo.GitDir, "MERGE_MSG"), _commitMessage);
-
-            _repo = null;
-            _inProgressContext = null;
-
-            _selectedUnstaged.Clear();
-            OnPropertyChanged(nameof(SelectedUnstaged));
-
-            _selectedStaged.Clear();
-            OnPropertyChanged(nameof(SelectedStaged));
-
-            _visibleUnstaged.Clear();
-            OnPropertyChanged(nameof(VisibleUnstaged));
-
-            _visibleStaged.Clear();
-            OnPropertyChanged(nameof(VisibleStaged));
-
-            _unstaged.Clear();
-            OnPropertyChanged(nameof(Unstaged));
-
-            _staged.Clear();
-            OnPropertyChanged(nameof(Staged));
-
-            _detailContext = null;
-            _commitMessage = string.Empty;
-        }
-
         public void SetData(List<Models.Change> changes)
         {
             if (!IsChanged(_cached, changes))
diff --git a/src/Views/LauncherPage.axaml b/src/Views/LauncherPage.axaml
@@ -31,7 +31,7 @@
 
     <!-- Body -->
     <Border Grid.Row="1">
-      <ContentControl Content="{Binding Data}">
+      <ContentControl Content="{Binding Data}">        
         <ContentControl.DataTemplates>
           <DataTemplate DataType="vm:Welcome">
             <v:Welcome/>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
@@ -921,6 +921,10 @@
 
       <ContentControl Grid.Row="3" Content="{Binding SelectedView}">
         <ContentControl.DataTemplates>
+          <DataTemplate DataType="m:Null">
+            <Border/>
+          </DataTemplate>
+          
           <DataTemplate DataType="vm:Histories">
             <v:Histories CurrentBranch="{Binding $parent[v:Repository].((vm:Repository)DataContext).CurrentBranch}"
                          Bisect="{Binding Bisect}"

Original file line number	Diff line number	Diff line change
`@@ -246,11 +246,10 @@ public static RepositoryUIStates Load(string gitDir)`
`246`	`246`	`return states;`
`247`	`247`	`}`
`248`	`248`
`249`		`- public void Unload(string lastCommitMessage)`
	`249`	`+ public void Unload()`
`250`	`250`	`{`
`251`	`251`	`try`
`252`	`252`	`{`
`253`		`- LastCommitMessage = lastCommitMessage;`
`254`	`253`	`using var stream = File.Create(_file);`
`255`	`254`	`JsonSerializer.Serialize(stream, this, JsonCodeGen.Default.RepositoryUIStates);`
`256`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public CommitDetailSharedData()`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`- public partial class CommitDetail : ObservableObject, IDisposable`
	`28`	`+ public partial class CommitDetail : ObservableObject`
`29`	`29`	`{`
`30`	`30`	`public Repository Repository`
`31`	`31`	`{`
`@@ -174,23 +174,6 @@ public CommitDetail(Repository repo, CommitDetailSharedData sharedData)`
`174`	`174`	`WebLinks = Models.CommitLink.Get(repo.Remotes);`
`175`	`175`	`}`
`176`	`176`
`177`		`- public void Dispose()`
`178`		`- {`
`179`		`- _repo = null;`
`180`		`- _commit = null;`
`181`		`- _changes = null;`
`182`		`- _visibleChanges = null;`
`183`		`- _selectedChanges = null;`
`184`		`- _signInfo = null;`
`185`		`- _searchChangeFilter = null;`
`186`		`- _diffContext = null;`
`187`		`- _viewRevisionFileContent = null;`
`188`		`- _cancellationSource = null;`
`189`		`- _requestingRevisionFiles = false;`
`190`		`- _revisionFiles = null;`
`191`		`- _revisionFileSearchSuggestion = null;`
`192`		`- }`
`193`		`-`
`194`	`177`	`public void NavigateTo(string commitSHA)`
`195`	`178`	`{`
`196`	`179`	`_repo?.NavigateToCommit(commitSHA);`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace SourceGit.ViewModels`
`12`	`12`	`{`
`13`		`- public class Histories : ObservableObject, IDisposable`
	`13`	`+ public class Histories : ObservableObject`
`14`	`14`	`{`
`15`	`15`	`public bool IsLoading`
`16`	`16`	`{`
`@@ -89,7 +89,7 @@ public long NavigationId`
`89`	`89`	`private set => SetProperty(ref _navigationId, value);`
`90`	`90`	`}`
`91`	`91`
`92`		`- public IDisposable DetailContext`
	`92`	`+ public object DetailContext`
`93`	`93`	`{`
`94`	`94`	`get => _detailContext;`
`95`	`95`	`set => SetProperty(ref _detailContext, value);`
`@@ -131,16 +131,6 @@ public Histories(Repository repo)`
`131`	`131`	`_commitDetailSharedData = new CommitDetailSharedData();`
`132`	`132`	`}`
`133`	`133`
`134`		`- public void Dispose()`
`135`		`- {`
`136`		`- Commits = [];`
`137`		`- _repo = null;`
`138`		`- _graph = null;`
`139`		`- _selectedCommit = null;`
`140`		`- _detailContext?.Dispose();`
`141`		`- _detailContext = null;`
`142`		`- }`
`143`		`-`
`144`	`134`	`public Models.BisectState UpdateBisectInfo()`
`145`	`135`	`{`
`146`	`136`	`var test = Path.Combine(_repo.GitDir, "BISECT_START");`
`@@ -454,7 +444,7 @@ public void CompareWithWorktree(Models.Commit commit)`
`454`	`444`	`private Models.Commit _selectedCommit = null;`
`455`	`445`	`private Models.Bisect _bisect = null;`
`456`	`446`	`private long _navigationId = 0;`
`457`		`- private IDisposable _detailContext = null;`
	`447`	`+ private object _detailContext = null;`
`458`	`448`	`private bool _ignoreSelectionChange = false;`
`459`	`449`
`460`	`450`	`private GridLength _leftArea = new GridLength(1, GridUnitType.Star);`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace SourceGit.ViewModels`
`10`	`10`	`{`
`11`		`- public class RevisionCompare : ObservableObject, IDisposable`
	`11`	`+ public class RevisionCompare : ObservableObject`
`12`	`12`	`{`
`13`	`13`	`public bool IsLoading`
`14`	`14`	`{`
`@@ -109,18 +109,6 @@ public RevisionCompare(Repository repo, Models.Commit startPoint, Models.Commit`
`109`	`109`	`Refresh();`
`110`	`110`	`}`
`111`	`111`
`112`		`- public void Dispose()`
`113`		`- {`
`114`		`- _repo = null;`
`115`		`- _startPoint = null;`
`116`		`- _endPoint = null;`
`117`		`- _changes?.Clear();`
`118`		`- _visibleChanges?.Clear();`
`119`		`- _selectedChanges?.Clear();`
`120`		`- _searchFilter = null;`
`121`		`- _diffContext = null;`
`122`		`- }`
`123`		`-`
`124`	`112`	`public void OpenChangeWithExternalDiffTool(Models.Change change)`
`125`	`113`	`{`
`126`	`114`	`var opt = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), change);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace SourceGit.ViewModels`
`9`	`9`	`{`
`10`		`- public class SearchCommitContext : ObservableObject, IDisposable`
	`10`	`+ public class SearchCommitContext : ObservableObject`
`11`	`11`	`{`
`12`	`12`	`public int Method`
`13`	`13`	`{`
`@@ -75,14 +75,6 @@ public SearchCommitContext(Repository repo)`
`75`	`75`	`_repo = repo;`
`76`	`76`	`}`
`77`	`77`
`78`		`- public void Dispose()`
`79`		`- {`
`80`		`- _repo = null;`
`81`		`- _suggestions?.Clear();`
`82`		`- _results?.Clear();`
`83`		`- _worktreeFiles?.Clear();`
`84`		`- }`
`85`		`-`
`86`	`78`	`public void ClearFilter()`
`87`	`79`	`{`
`88`	`80`	`Filter = string.Empty;`