Make sure the background parser gets disposed

prolee · Feb 8, 2013 · f212fea · f212fea
1 parent a3ed0f5
commit f212fea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Diff/DiffMargin.cs b/Diff/DiffMargin.cs
@@ -21,6 +21,7 @@ public class DiffMargin : IWpfTextViewMargin
 
         private readonly IWpfTextView _textView;
         private readonly IEditorFormatMap _editorFormatMap;
+        private readonly DiffMarginViewModel _viewModel;
         private readonly DiffMarginControl _gitDiffBarControl;
         private bool _isDisposed;
 
@@ -44,7 +45,8 @@ public DiffMargin(IWpfTextView textView, ITextDocumentFactoryService textDocumen
             _textView.Options.OptionChanged += HandleOptionChanged;
 
             _gitDiffBarControl = new DiffMarginControl();
-            _gitDiffBarControl.DataContext = new DiffMarginViewModel(this, _textView, textDocumentFactoryService, new GitCommands());
+            _viewModel = new DiffMarginViewModel(this, _textView, textDocumentFactoryService, new GitCommands());
+            _gitDiffBarControl.DataContext = _viewModel;
             _gitDiffBarControl.Width = MarginWidth;
             UpdateVisibility();
         }
@@ -117,6 +119,7 @@ public ITextViewMargin GetTextViewMargin(string marginName)
         public void Dispose()
         {
             GC.SuppressFinalize(this);
+            _viewModel.Cleanup();
             _isDisposed = true;
         }
 

diff --git a/Diff/ViewModel/DiffMarginViewModel.cs b/Diff/ViewModel/DiffMarginViewModel.cs
@@ -78,6 +78,12 @@ public RelayCommand<DiffViewModel> NextChangeCommand
             }
         }
 
+        public override void Cleanup()
+        {
+            _parser.Dispose();
+            base.Cleanup();
+        }
+
         private bool PreviousChangeCanExecute(DiffViewModel currentDiffViewModel)
         {
             return DiffViewModels.IndexOf(currentDiffViewModel) > 0;