From 300fcb78daa2752fdc7f43751309ff60027c3119 Mon Sep 17 00:00:00 2001
From: BookerLiu <booker_liu@163.com>
Date: Tue, 21 Mar 2023 17:54:23 +0800
Subject: [PATCH] =?UTF-8?q?:children=5Fcrossing:=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=A9=BA=E8=8F=9C=E5=8D=95=E4=B8=8D=E8=BF=9B=E8=A1=8C=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PannelCard/LeftCardControl.xaml.cs        | 66 +++++++++++--------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/Control/UserControls/PannelCard/LeftCardControl.xaml.cs b/Control/UserControls/PannelCard/LeftCardControl.xaml.cs
index 709d621..8899cae 100644
--- a/Control/UserControls/PannelCard/LeftCardControl.xaml.cs
+++ b/Control/UserControls/PannelCard/LeftCardControl.xaml.cs
@@ -295,34 +295,46 @@ namespace GeekDesk.Control.UserControls.PannelCard
         /// <param name="e"></param>
         private void DeleteMenu(object sender, RoutedEventArgs e)
         {
-            HandyControl.Controls.Growl.Ask("确认删除此菜单吗?", isConfirmed =>
-            {
-                if (isConfirmed)
-                {
-                    MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
-                    if (appData.MenuList.Count == 1)
-                    {
-                        //如果删除以后没有菜单的话 先创建一个
-                        CreateMenu(null, null);
-                    }
-                    int index = appData.MenuList.IndexOf(menuInfo);
-                    if (index == 0)
-                    {
-                        index = 0;
-                    }
-                    else
-                    {
-                        index--;
-                    }
 
-                    appData.MenuList.Remove(menuInfo);
-                    // 选中下一个菜单
-                    MenuListBox.SelectedIndex = index;
-                    appData.AppConfig.SelectedMenuIndex = MenuListBox.SelectedIndex;
-                    appData.AppConfig.SelectedMenuIcons = appData.MenuList[index].IconList;
-                }
-                return true;
-            }, "MainWindowAskGrowl");
+            MenuInfo menuInfo = ((MenuItem)sender).Tag as MenuInfo;
+            if (menuInfo.IconList != null && menuInfo.IconList.Count > 0)
+            {
+                HandyControl.Controls.Growl.Ask("确认删除此菜单吗?", isConfirmed =>
+                {
+                    if (isConfirmed)
+                    {
+                        DeleteMenu(menuInfo);
+                    }
+                    return true;
+                }, "MainWindowAskGrowl");
+            } else
+            {
+                DeleteMenu(menuInfo);
+            }
+        }
+
+        private void DeleteMenu(MenuInfo menuInfo)
+        {
+            if (appData.MenuList.Count == 1)
+            {
+                //如果删除以后没有菜单的话 先创建一个
+                CreateMenu(null, null);
+            }
+            int index = appData.MenuList.IndexOf(menuInfo);
+            if (index == 0)
+            {
+                index = 0;
+            }
+            else
+            {
+                index--;
+            }
+
+            appData.MenuList.Remove(menuInfo);
+            // 选中下一个菜单
+            MenuListBox.SelectedIndex = index;
+            appData.AppConfig.SelectedMenuIndex = MenuListBox.SelectedIndex;
+            appData.AppConfig.SelectedMenuIcons = appData.MenuList[index].IconList;
         }
 
         /// <summary>