From 940d2eb631e7a33472adef3c2e220caebb999efb Mon Sep 17 00:00:00 2001
From: Darth Affe <darthaffe@wyrez.org>
Date: Fri, 9 Feb 2018 21:12:33 +0100
Subject: [PATCH] Added a workaround for the weird windows taskbar-closewindow
 behavior

---
 KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml    | 3 ++-
 KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml.cs | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml b/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml
index 0f6751a..e24090c 100644
--- a/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml
+++ b/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml
@@ -17,7 +17,8 @@
                                   Title="Keyboard Audio-Visualizer # Configuration" 
                                   Icon="pack://application:,,,/KeyboardAudioVisualizer;component/Resources/Icon.ico"
                                   IconCommand="{Binding OpenHomepageCommand}"
-                                  Width="1280"  Height="720">
+                                  Width="1280"  Height="720"
+                                  Closed="ConfigurationWindow_OnClosed">
 
     <controls:BlurredDecorationWindow.Resources>
         <styles:CachedResourceDictionary>
diff --git a/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml.cs b/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml.cs
index 3fa71ce..e198146 100644
--- a/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml.cs
+++ b/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml.cs
@@ -1,9 +1,16 @@
-using KeyboardAudioVisualizer.Controls;
+using System;
+using KeyboardAudioVisualizer.Controls;
 
 namespace KeyboardAudioVisualizer.UI
 {
     public partial class ConfigurationWindow : BlurredDecorationWindow
     {
         public ConfigurationWindow() => InitializeComponent();
+
+        //DarthAffe 07.02.2018: This prevents the applicaiton from not shutting down and crashing afterwards if 'close' is selected in the taskbar-context-menu
+        private void ConfigurationWindow_OnClosed(object sender, EventArgs e)
+        {
+            ApplicationManager.Instance.ExitCommand.Execute(null);
+        }
     }
 }