From 9d78ac8b4ba04bfb767dd34509eb93fb96d4ad51 Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Fri, 30 Oct 2015 21:23:10 +0100
Subject: [PATCH] Error handling. Bugfix

---
 MusicPlayer/MusicPlayer/AudioHandler.cs | 12 +++++++++++-
 MusicPlayer/MusicPlayer/MainForm.cs     |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/MusicPlayer/MusicPlayer/AudioHandler.cs b/MusicPlayer/MusicPlayer/AudioHandler.cs
index d5f6439..42ded46 100755
--- a/MusicPlayer/MusicPlayer/AudioHandler.cs
+++ b/MusicPlayer/MusicPlayer/AudioHandler.cs
@@ -110,8 +110,18 @@ namespace MusicPlayer
         {
             long position = 0;
             ms.Position = position;
+            Mp3FileReader mp3fr = null;
 
-            Mp3FileReader mp3fr = new Mp3FileReader(ms);
+            try
+            {
+                mp3fr = new Mp3FileReader(ms);
+            }
+            catch(Exception e)
+            {
+                AState = AudioState.STOPPED;
+                return;
+            }
+            
             
             using (WaveStream blockAlignedStream = new BlockAlignReductionStream(WaveFormatConversionStream.CreatePcmStream(mp3fr)))
             {
diff --git a/MusicPlayer/MusicPlayer/MainForm.cs b/MusicPlayer/MusicPlayer/MainForm.cs
index 4625502..d9e936a 100644
--- a/MusicPlayer/MusicPlayer/MainForm.cs
+++ b/MusicPlayer/MusicPlayer/MainForm.cs
@@ -231,6 +231,8 @@ namespace MusicPlayer
         private void ExitProgram()
         {
             main.audio.AState = AudioHandler.AudioState.STOPPED;
+            NotifyIcon.Visible = false;
+            NotifyIcon.Icon = null;
             System.Windows.Forms.Application.Exit();
         }