修复重载后菜单数目异常

opq-osc · Mar 3, 2021 · 94cb1f9 · 94cb1f9
1 parent e37cfad
commit 94cb1f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Launcher/NotifyIconHelper.cs b/Launcher/NotifyIconHelper.cs
@@ -132,7 +132,11 @@ public static void HideNotifyIcon()
         public static void RemoveMenu(string pluginName)
         {
             var item = _NotifyIcon.ContextMenu.MenuItems.Find(pluginName, true).First();
-            _NotifyIcon.ContextMenu.MenuItems[0].MenuItems.Remove(item);
+            _NotifyIcon.ContextMenu.MenuItems[2].MenuItems.Remove(item);
+        }
+        public static void ClearAppMenu()
+        {
+            _NotifyIcon.ContextMenu.MenuItems[2].MenuItems.Clear();
         }
         public static void Quit()
         {

diff --git a/Launcher/PluginManagment.cs b/Launcher/PluginManagment.cs
@@ -192,7 +192,6 @@ public void UnLoad(Plugin plugin)
                 plugin.dll.CallFunction(FunctionEnums.Functions.Disable);
                 plugin.dll.CallFunction(FunctionEnums.Functions.Exit);
                 plugin.dll.UnLoad();
-                NotifyIconHelper.RemoveMenu(plugin.appinfo.Name);
                 Plugins.Remove(plugin);
                 LogHelper.WriteLog(LogLevel.InfoSuccess, "插件卸载", $"插件 {plugin.appinfo.Name} 卸载成功");
                 plugin = null; GC.Collect();
@@ -208,6 +207,7 @@ public void UnLoad(Plugin plugin)
         public void UnLoad()
         {
             LogHelper.WriteLog("开始卸载插件...");
+            NotifyIconHelper.ClearAppMenu();
             foreach(var item in AppDomainSave)
             {
                 var c = Plugins.Find(x => x.iLib == item.Key);