Merge pull request #78 from YoshihiroIto/master

lock listeners
danipen · Dec 13, 2024 · 1d139b0 · 1d139b0
2 parents 0b99f35 + 22d2b04
commit 1d139b0
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/TextMateSharp/Model/TMModel.cs b/src/TextMateSharp/Model/TMModel.cs
@@ -327,7 +327,11 @@ public void RemoveModelTokensChangedListener(IModelTokensChangedListener listene
 
         public void Dispose()
         {
-            listeners.Clear();
+            lock (listeners)
+            {
+                listeners.Clear();
+            }
+
             Stop();
             GetLines().Dispose();
         }
@@ -375,15 +379,18 @@ private void BuildEventWithCallback(Action<ModelTokensChangedEventBuilder> callb
 
         private void Emit(ModelTokensChangedEvent e)
         {
-            foreach (IModelTokensChangedListener listener in listeners)
+            lock (listeners)
             {
-                try
-                {
-                    listener.ModelTokensChanged(e);
-                }
-                catch (Exception ex)
+                foreach (IModelTokensChangedListener listener in listeners)
                 {
-                    System.Diagnostics.Debug.WriteLine(ex.Message);
+                    try
+                    {
+                        listener.ModelTokensChanged(e);
+                    }
+                    catch (Exception ex)
+                    {
+                        System.Diagnostics.Debug.WriteLine(ex.Message);
+                    }
                 }
             }
         }