From 401d832430951aa7fc25bbed8dcb7af00704c639 Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Sun, 8 Nov 2015 18:50:57 +0100
Subject: [PATCH] Bugfixes with filesaving

---
 MusicPlayer/MusicPlayer/MainForm.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/MusicPlayer/MusicPlayer/MainForm.cs b/MusicPlayer/MusicPlayer/MainForm.cs
index 97445f4..914b2a2 100644
--- a/MusicPlayer/MusicPlayer/MainForm.cs
+++ b/MusicPlayer/MusicPlayer/MainForm.cs
@@ -704,7 +704,10 @@ namespace MusicPlayer
             SaveFileDialog SaveMP3FromBuffer = new SaveFileDialog();
             SaveMP3FromBuffer.Filter = "MP3 File|*.mp3";
             SaveMP3FromBuffer.Title = "Save current song to mp3 file";
-            SaveMP3FromBuffer.ShowDialog();
+            SaveMP3FromBuffer.FileName = main.audio.CurrentSong.Name + ".mp3";
+
+            if(SaveMP3FromBuffer.ShowDialog() != DialogResult.OK)
+                return;
 
             // If the file name is not an empty string open it for saving.
             if (SaveMP3FromBuffer.FileName != "")
@@ -716,7 +719,7 @@ namespace MusicPlayer
                     }
                     catch(Exception)
                     {
-                        MessageBox.Show("Error while saving file");
+                        MessageBox.Show("File saved.");
                     }
                 }
                 else