Better disposing of icon handle

Author: tommaier123

XBatteryStatus/MyApplicationContext.cs

@@ -548,13 +548,22 @@ public bool IsLightMode()
         public void SetIcon(int val, string s = "")
         {
             Icon oldIcon = notifyIcon.Icon;
-            notifyIcon.Icon = GetIcon(val, s); ;
+            IntPtr oldHandle = IntPtr.Zero;
+            
+            if (oldIcon != null)
+            {
+                oldHandle = oldIcon.Handle;
+            }
+            
+            notifyIcon.Icon = GetIcon(val, s);
 
             if (oldIcon != null)
             {
-                IntPtr oldHandle = oldIcon.Handle;
                 oldIcon.Dispose();
-                DestroyIcon(oldHandle);
+                if (oldHandle != IntPtr.Zero)
+                {
+                    DestroyIcon(oldHandle);
+                }
             }
         }