From bf23572925e89b9e5abb4b4fccbdbeebe37f086a Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Thu, 29 Mar 2012 20:36:39 +0200
Subject: [PATCH] fix http://community.sharpdevelop.net/forums/t/15618.aspx -
 do not dispose change watcher in ChangeMarkerMargin - it could be used by two
 different margins (in two synchronized text editors, for ex. split view)

---
 .../DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs  | 1 -
 src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
index 600cba254f..cbe6842867 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
@@ -39,7 +39,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
 		{
 			if (!disposed) {
 				changeWatcher.ChangeOccurred -= ChangeOccurred;
-				changeWatcher.Dispose();
 				disposed = true;
 			}
 		}
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs
index c821cccfa5..bbe07412da 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs
@@ -610,6 +610,8 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			
 			if (errorPainter != null)
 				errorPainter.Dispose();
+			if (changeWatcher != null)
+				changeWatcher.Dispose();
 			this.Document = null;
 			DisposeTextEditor(primaryTextEditor);
 			if (secondaryTextEditor != null)