From 22bfc77a7a13ae9d07b6184ab05e911d5785624c Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Tue, 21 Nov 2023 13:13:29 +0100
Subject: [PATCH] Icon Helper

---
 app/UI/IconHelper.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/UI/IconHelper.cs b/app/UI/IconHelper.cs
index 4daad6f2..2af3adf5 100644
--- a/app/UI/IconHelper.cs
+++ b/app/UI/IconHelper.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 namespace GHelper.UI
@@ -16,8 +16,15 @@ namespace GHelper.UI
 
         public static void SetIcon(Form form, Bitmap icon)
         {
-            SendMessage(form.Handle, WM_SETICON, ICON_SMALL, icon.GetHicon());
-            SendMessage(form.Handle, WM_SETICON, ICON_BIG, Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location)!.Handle);
+            try
+            {
+                SendMessage(form.Handle, WM_SETICON, ICON_BIG, Icon.ExtractAssociatedIcon(Application.ExecutablePath)!.Handle);
+                SendMessage(form.Handle, WM_SETICON, ICON_SMALL, icon.GetHicon());
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Error setting icon {ex.Message}");
+            }
         }
 
     }