fix: Removed UpdateIcon failed exception.

HavenDV · Jan 3, 2024 · 10e6f83 · 10e6f83
1 parent c88a074
commit 10e6f83
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/libs/H.NotifyIcon.Shared/TaskbarIcon.Properties.cs b/src/libs/H.NotifyIcon.Shared/TaskbarIcon.Properties.cs
@@ -43,7 +43,7 @@ partial void OnCustomNameChanged(string? newValue)
     partial void OnIconChanged(Icon? oldValue, Icon? newValue)
     {
         oldValue?.Dispose();
-        UpdateIcon(newValue);
+        _ = UpdateIcon(newValue);
     }
 
     /// <summary>
@@ -52,10 +52,12 @@ partial void OnIconChanged(Icon? oldValue, Icon? newValue)
     /// <param name="value"></param>
     [CLSCompliant(false)]
     [SupportedOSPlatform("windows5.1.2600")]
-    public void UpdateIcon(Icon? value)
+    public bool UpdateIcon(Icon? value)
     {
 #if !MACOS
-        TrayIcon.UpdateIcon((nint?)value?.Handle ?? 0);
+        return TrayIcon.UpdateIcon((nint?)value?.Handle ?? 0);
+#else
+        return true;
 #endif
     }
 

diff --git a/src/libs/H.NotifyIcon/Core/TrayIcon.cs b/src/libs/H.NotifyIcon/Core/TrayIcon.cs
@@ -459,14 +459,14 @@ public void UpdateToolTip(string text)
     /// <param name="handle">The title to display on the balloon tip.</param>
     /// <exception cref="InvalidOperationException"></exception>
     /// <exception cref="ObjectDisposedException"></exception>
-    public void UpdateIcon(nint handle)
+    public bool UpdateIcon(nint handle)
     {
         EnsureNotDisposed();
 
         if (!IsCreated)
         {
             Icon = handle;
-            return;
+            return true;
         }
 
         var additionalFlags = (NOTIFY_ICON_DATA_FLAGS)0;
@@ -477,9 +477,11 @@ public void UpdateIcon(nint handle)
 
         if (!TrayIconMethods.TryModifyIcon(Id, additionalFlags, handle))
         {
-            throw new InvalidOperationException("UpdateIcon failed.");
+            return false;
         }
+
         Icon = handle;
+        return true;
     }
 #endif