UITools ignores more notifications and OnUIRefresh now checks for UI thread. Fixes #1114.

Author: Meychi

PluginCore/PluginCore/Controls/UITools.cs

@@ -137,7 +137,14 @@ public void HandleEvent(object sender, NotifyEvent e, HandlingPriority priority)
 
                 case EventType.Command:
                     string cmd = (e as DataEvent).Action;
-                    if (cmd.StartsWithOrdinal("ProjectManager") || cmd.IndexOfOrdinal("Changed") > 0 || cmd.IndexOfOrdinal("Context") > 0)
+                    if (cmd.IndexOfOrdinal("ProjectManager") > 0
+                        || cmd.IndexOfOrdinal("Changed") > 0
+                        || cmd.IndexOfOrdinal("Context") > 0
+                        || cmd.IndexOfOrdinal("ClassPath") > 0
+                        || cmd.IndexOfOrdinal("Watcher") > 0
+                        || cmd.IndexOfOrdinal("Get") > 0
+                        || cmd.IndexOfOrdinal("Set") > 0
+                        || cmd.IndexOfOrdinal("SDK") > 0)
                         return; // ignore notifications
                     break;
             }
@@ -288,6 +295,12 @@ public void UnlockControl()
 
         private void OnUIRefresh(ScintillaControl sci)
         {
+            Form mainForm = PluginBase.MainForm as Form;
+            if (mainForm.InvokeRequired)
+            {
+                mainForm.BeginInvoke((MethodInvoker)delegate { this.OnUIRefresh(sci); });
+                return;
+            }
             if (sci != null && sci.IsFocus)
             {
                 int position = sci.CurrentPos;