Fix for HDT update.

rembound · Feb 18, 2016 · dca6db1 · dca6db1
1 parent 8dc0c29
commit dca6db1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/ArenaWindow.xaml b/ArenaWindow.xaml
@@ -30,7 +30,7 @@
                             <VisualBrush Visual="{StaticResource appbar_heart}" />
                         </Rectangle.Fill>
                     </Rectangle>
-                    <TextBlock Margin="4" VerticalAlignment="Center" Text="About" />
+                    <TextBlock Margin="4" VerticalAlignment="Center" Text="Support" />
                 </StackPanel>
             </Button>
         </controls:WindowCommands>

diff --git a/Plugin.cs b/Plugin.cs
@@ -314,7 +314,7 @@ public string Author
 
         public Version Version
         {
-            get { return new Version("0.6.6"); }
+            get { return new Version("0.6.7"); }
         }
 
         public MenuItem MenuItem
@@ -689,7 +689,6 @@ private void SaveDeck(bool autosave)
         {
             // Save deck
             Deck deck = new Deck();
-            deck.Name = arenadata.deckname;
             deck.IsArenaDeck = true;
 
             if (autosave)
@@ -728,6 +727,9 @@ private void SaveDeck(bool autosave)
             // Add tag
             deck.Tags.Add("Arena");
 
+            // Deck name based on class
+            deck.Name = Helper.ParseDeckNameTemplate(Config.Instance.ArenaDeckNameTemplate, deck);
+
             if (!autosave)
             {
                 // Set the new deck
@@ -979,7 +981,16 @@ public async void OnUpdate()
                             // With manual clicks or logreader, we don't need the focus
                             needsfocus = false;
                         }
-                        fullcapture = Helper.CaptureHearthstone(new Point(0, 0), hsrect.Width, hsrect.Height, default(IntPtr), needsfocus);
+                        //fullcapture = Helper.CaptureHearthstone(new Point(0, 0), hsrect.Width, hsrect.Height, default(IntPtr), needsfocus);
+                        //fullcapture = await Helper.CaptureHearthstoneAsync(new Point(0, 0), hsrect.Width, hsrect.Height, default(IntPtr), needsfocus);
+                        if (needsfocus && !User32.IsHearthstoneInForeground())
+                        {
+                            fullcapture = null;
+                        }
+                        else
+                        {
+                            fullcapture = Helper.CaptureScreen(User32.GetHearthstoneWindow(), new Point(0, 0), hsrect.Width, hsrect.Height);
+                        }
                     }
                     else
                     {