Don't silent exception when can't extract Icon.

Fixes #71
Belphemur · Feb 21, 2016 · 29b6315 · 29b6315
1 parent 8fc9a37
commit 29b6315
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/SoundSwitch/Util/IconExtractor.cs b/SoundSwitch/Util/IconExtractor.cs
@@ -16,9 +16,28 @@
 using System;
 using System.Drawing;
 using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
 
 namespace SoundSwitch.Util
 {
+    public class IconExtractionException : Exception
+    {
+        public IconExtractionException()
+        {
+        }
+
+        public IconExtractionException(string message) : base(message)
+        {
+        }
+
+        public IconExtractionException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        protected IconExtractionException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+    }
     public static class IconExtractor
     {
         /// <summary>
@@ -27,6 +46,7 @@ public static class IconExtractor
         /// <param name="file"></param>
         /// <param name="iconIndex"></param>
         /// <param name="largeIcon"></param>
+        /// <exception cref="IconExtractionException">Problem while extracting the icon</exception>
         /// <returns></returns>
         public static Icon Extract(string file, int iconIndex, bool largeIcon)
         {
@@ -37,9 +57,9 @@ public static Icon Extract(string file, int iconIndex, bool largeIcon)
             {
                 return Icon.FromHandle(largeIcon ? large : small);
             }
-            catch
+            catch(Exception e)
             {
-                return null;
+                throw new IconExtractionException($"Can't etract icon from file: {file} / index:{iconIndex}", e);
             }
         }