From e075d3ef44241473cf9eda9d320b0b23d15600ff Mon Sep 17 00:00:00 2001
From: epix37 <epikz37@gmail.com>
Date: Sun, 29 Jun 2014 13:42:14 +0200
Subject: [PATCH] v0.3.5,

fixed freeze on start,
fixed new deck not being cleared
---
 Hearthstone Deck Tracker/MainWindow.xaml.cs | 33 ++++++++++++++++-----
 Hearthstone Deck Tracker/Version.xml        |  2 +-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/Hearthstone Deck Tracker/MainWindow.xaml.cs b/Hearthstone Deck Tracker/MainWindow.xaml.cs
index d6c6e01338..30b4d3f047 100644
--- a/Hearthstone Deck Tracker/MainWindow.xaml.cs	
+++ b/Hearthstone Deck Tracker/MainWindow.xaml.cs	
@@ -1151,10 +1151,14 @@ private void DeckPickerListOnSelectedDeckChanged(DeckPicker sender, Deck deck)
                 while (_deckList.LastDeckClass.Any(ldc => ldc.Class == deck.Class))
                 {
                     var lastSelected = _deckList.LastDeckClass.FirstOrDefault(ldc => ldc.Class == deck.Class);
-                    if (DeckPickerList.SelectedDeck != null)
+                    if (lastSelected != null)
                     {
                         _deckList.LastDeckClass.Remove(lastSelected);
                     }
+                    else
+                    {
+                        break;
+                    }
                 }
                 _deckList.LastDeckClass.Add(new DeckInfo(){Class = deck.Class, Name = deck.Name});
                 _xmlManager.Save("PlayerDecks.xml", _deckList);
@@ -1378,7 +1382,11 @@ private void Grid_Drop(object sender, DragEventArgs e)
                 UpdateDbListView();
             }
         }
-
+        
+        private void TextBoxDBFilter_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            UpdateDbListView();
+        }
 
         #endregion
 
@@ -1521,10 +1529,10 @@ private void ClearNewDeckSection()
             TextBoxDeckName.Text = string.Empty;
             TextBoxDBFilter.Text = string.Empty;
             ComboBoxFilterMana.SelectedIndex = 0;
-            _newDeck.Cards.Clear();
-            _newDeck.Class = string.Empty;
-            _newDeck.Name = string.Empty;
+            _newDeck = new Deck();
+            ListViewNewDeck.ItemsSource = _newDeck.Cards;
             _newContainsDeck = false;
+            _editingDeck = false;
         }
 
         private void RemoveCardFromDeck(Card card)
@@ -1569,11 +1577,18 @@ private void AddCardToDeck(Card card)
             UpdateNewDeckHeader(true);
         }
 
-        private void TextBoxDBFilter_TextChanged(object sender, TextChangedEventArgs e)
+
+        private async void ShowClearNewDeckMessage()
         {
-            UpdateDbListView();
+            var settings = new MetroDialogSettings();
+            settings.AffirmativeButtonText = "Yes";
+            settings.NegativeButtonText = "No";
+            var result = await this.ShowMessageAsync("Clear deck?", "", MessageDialogStyle.AffirmativeAndNegative, settings);
+            if (result == MessageDialogResult.Affirmative)
+            {
+                ClearNewDeckSection();
+            }
         }
-
         
         #endregion
 
@@ -2275,5 +2290,7 @@ private void CheckboxExportName_Unchecked(object sender, RoutedEventArgs e)
         }
         #endregion
 
+        
+
     }
 }
\ No newline at end of file
diff --git a/Hearthstone Deck Tracker/Version.xml b/Hearthstone Deck Tracker/Version.xml
index d37c01ad70..305f536c4f 100644
--- a/Hearthstone Deck Tracker/Version.xml	
+++ b/Hearthstone Deck Tracker/Version.xml	
@@ -2,6 +2,6 @@
 <Version>
   <Major>0</Major>
   <Minor>3</Minor>
-  <Revision>4</Revision>
+  <Revision>5</Revision>
   <Build>0</Build>
 </Version>