From 43fd63e5a0415a8477bebc389b862599e4ca1965 Mon Sep 17 00:00:00 2001
From: alcexhim <alcexhim@gmail.com>
Date: Tue, 21 Apr 2015 10:25:45 -0400
Subject: [PATCH] Prevent BeginEdit/EndEdit during a BeginUpdate/EndUpdate
 wrapped task

---
 .../Editor.cs                                 | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/Editor.cs b/CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/Editor.cs
index c22a66bb..5b77000d 100644
--- a/CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/Editor.cs
+++ b/CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/Editor.cs
@@ -211,11 +211,18 @@ namespace UniversalEditor.UserInterface.WindowsForms
 			set
 			{
 				ObjectModelChangingEventArgs omce = new ObjectModelChangingEventArgs(mvarObjectModel, value);
+
+				BeginUpdate();
 				OnObjectModelChanging(omce);
+				EndUpdate();
+
 				if (omce.Cancel) return;
 
 				mvarObjectModel = omce.NewObjectModel;
+				
+				BeginUpdate();
 				OnObjectModelChanged(EventArgs.Empty);
+				EndUpdate();
 			}
 		}
 		#endregion
@@ -266,9 +273,22 @@ namespace UniversalEditor.UserInterface.WindowsForms
 		}
 
 		private int mvarEditing = 0;
+		private int mvarUpdating = 0;
+
+		protected void BeginUpdate()
+		{
+			mvarUpdating++;
+		}
+		protected void EndUpdate()
+		{
+			if (mvarUpdating == 0) return;
+			mvarUpdating--;
+		}
 
 		protected void BeginEdit()
 		{
+			if (mvarUpdating > 0) return;
+
 			if (mvarEditing > 0)
 			{
 				mvarEditing++;
@@ -326,6 +346,8 @@ namespace UniversalEditor.UserInterface.WindowsForms
 		}
 		protected void EndEdit()
 		{
+			if (mvarUpdating > 0) return;
+
 			if (mvarEditing == 0) return; // throw new InvalidOperationException();
 			if (mvarEditing > 1)
 			{