Fix for Issue #54 - Assign default icon for device if one does not ex…

…ists
sirWest · Feb 8, 2016 · 8cdc8b8 · 8cdc8b8
1 parent c345a3f
commit 8cdc8b8
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/Classes/DeviceIcons.cs b/Classes/DeviceIcons.cs
@@ -3,6 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using AudioSwitch.Properties;
+using System.IO;
 
 namespace AudioSwitch.Classes
 {
@@ -57,16 +58,22 @@ internal static Icon GetIcon(string iconPath)
             var path = is64bit ? iconPath.ToLower().Replace("\\system32\\", "\\sysnative\\") : iconPath;
             path = Environment.ExpandEnvironmentVariables(path);
             var iconAdr = path.Split(',');
-
-            Icon icon;
-            if (iconAdr.Length > 1)
+            Icon icon = null;
+            if (File.Exists(iconAdr[0]))
             {
-                var hIconEx = new IntPtr[1];
-                ExtractIconEx(iconAdr[0], int.Parse(iconAdr[1]), hIconEx, null, 1);
-                icon = Icon.FromHandle(hIconEx[0]);
+                if (iconAdr.Length > 1)
+                {
+                    var hIconEx = new IntPtr[1];
+                    ExtractIconEx(iconAdr[0], int.Parse(iconAdr[1]), hIconEx, null, 1);
+                    icon = Icon.FromHandle(hIconEx[0]);
+                }
+                else
+                    icon = new Icon(iconAdr[0], NormalIcons.ImageSize.Width, NormalIcons.ImageSize.Height);
             }
             else
-                icon = new Icon(iconAdr[0], NormalIcons.ImageSize.Width, NormalIcons.ImageSize.Height);
+            {
+                icon = SystemIcons.Warning;
+            }
             return icon;
         }