From 915aff2eeace37ad57b16493c348159e64a2f715 Mon Sep 17 00:00:00 2001
From: zhouzj <comesx4@gmail.com>
Date: Mon, 5 Dec 2022 14:34:33 +0800
Subject: [PATCH] Prevent showing trayMenu if the menu is empty.

---
 src/Windows/Avalonia.Win32/TrayIconImpl.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/TrayIconImpl.cs b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
index 8d565d7fef..ddc42b3248 100644
--- a/src/Windows/Avalonia.Win32/TrayIconImpl.cs
+++ b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
@@ -19,7 +19,7 @@ namespace Avalonia.Win32
     public class TrayIconImpl : ITrayIconImpl
     {
         private static readonly IntPtr s_emptyIcon = new System.Drawing.Bitmap(32, 32).GetHicon();
-        
+
         private readonly int _uniqueId;
         private static int s_nextUniqueId;
         private bool _iconAdded;
@@ -137,6 +137,12 @@ namespace Avalonia.Win32
 
         private void OnRightClicked()
         {
+            var menuItems = _exporter.GetMenu();
+            if (null == menuItems || menuItems.Count == 0)
+            {
+                return;
+            }
+
             var _trayMenu = new TrayPopupRoot()
             {
                 SystemDecorations = SystemDecorations.None,
@@ -145,7 +151,7 @@ namespace Avalonia.Win32
                 TransparencyLevelHint = WindowTransparencyLevel.Transparent,
                 Content = new TrayIconMenuFlyoutPresenter()
                 {
-                    Items = _exporter.GetMenu()
+                    Items = menuItems
                 }
             };