From 1c9032dd7228ae2c2ae520dae690f0851fda1a33 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Fri, 10 Feb 2023 13:04:14 +0100
Subject: [PATCH] Win32 tray icon: avoid HIcon access when removing

Prevents a crash when the TrayIconImpl finalizer runs after the System.Drawing.Icon has been disposed
---
 src/Windows/Avalonia.Win32/TrayIconImpl.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/TrayIconImpl.cs b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
index ab70d77a09..fe920ff1a1 100644
--- a/src/Windows/Avalonia.Win32/TrayIconImpl.cs
+++ b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
@@ -81,19 +81,18 @@ namespace Avalonia.Win32
 
         private void UpdateIcon(bool remove = false)
         {
-            var iconData = new NOTIFYICONDATA()
+            var iconData = new NOTIFYICONDATA
             {
                 hWnd = Win32Platform.Instance.Handle,
-                uID = _uniqueId,
-                uFlags = NIF.TIP | NIF.MESSAGE,
-                uCallbackMessage = (int)CustomWindowsMessage.WM_TRAYMOUSE,
-                hIcon = _icon?.HIcon ?? s_emptyIcon,
-                szTip = _tooltipText ?? ""
+                uID = _uniqueId
             };
 
             if (!remove)
             {
-                iconData.uFlags |= NIF.ICON;
+                iconData.uFlags = NIF.TIP | NIF.MESSAGE | NIF.ICON;
+                iconData.uCallbackMessage = (int)CustomWindowsMessage.WM_TRAYMOUSE;
+                iconData.hIcon = _icon?.HIcon ?? s_emptyIcon;
+                iconData.szTip = _tooltipText ?? "";
 
                 if (!_iconAdded)
                 {
@@ -107,6 +106,7 @@ namespace Avalonia.Win32
             }
             else
             {
+                iconData.uFlags = 0;
                 Shell_NotifyIcon(NIM.DELETE, iconData);
                 _iconAdded = false;
             }