From 76484853411d942450cede865f2fc54548c5cc7c Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Fri, 10 Nov 2017 03:55:17 +0300
Subject: [PATCH] Fixed taskbar highlight issue when editor is open and another
 task completes upload

---
 ShareX.ImageEffectsLib/Drawings/DrawText.cs |  3 ---
 ShareX/TaskManager.cs                       | 23 +++++++--------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/ShareX.ImageEffectsLib/Drawings/DrawText.cs b/ShareX.ImageEffectsLib/Drawings/DrawText.cs
index 0d8d2a555..e8657d4b7 100644
--- a/ShareX.ImageEffectsLib/Drawings/DrawText.cs
+++ b/ShareX.ImageEffectsLib/Drawings/DrawText.cs
@@ -250,9 +250,6 @@ public override Image Apply(Image img)
                         }
                     }
 
-                    float centerX = watermarkRectangle.Width / 2f - (Padding.Right - Padding.Left);
-                    float centerY = watermarkRectangle.Height / 2f - (Padding.Bottom - Padding.Top);
-
                     if (DrawTextShadow)
                     {
                         using (Brush textShadowBrush = new SolidBrush(TextShadowColor))
diff --git a/ShareX/TaskManager.cs b/ShareX/TaskManager.cs
index 0b11a2d78..9a53a9cb6 100644
--- a/ShareX/TaskManager.cs
+++ b/ShareX/TaskManager.cs
@@ -457,14 +457,14 @@ private static void Task_UploadersConfigWindowRequested(IUploaderService uploade
 
         public static void UpdateProgressUI()
         {
-            bool isWorkingTasks = false;
+            bool isTasksWorking = false;
             double averageProgress = 0;
 
             IEnumerable<WorkerTask> workingTasks = Tasks.Where(x => x != null && x.Status == TaskStatus.Working && x.Info != null);
 
             if (workingTasks.Count() > 0)
             {
-                isWorkingTasks = true;
+                isTasksWorking = true;
 
                 workingTasks = workingTasks.Where(x => x.Info.Progress != null);
 
@@ -474,25 +474,16 @@ public static void UpdateProgressUI()
                 }
             }
 
-            int progress = isWorkingTasks ? (int)averageProgress : -1;
-            UpdateTrayIcon(progress);
-
-            string title;
-
-            if (isWorkingTasks)
+            if (isTasksWorking)
             {
-                title = string.Format("{0} - {1:0.0}%", Program.Title, averageProgress);
+                Program.MainForm.Text = string.Format("{0} - {1:0.0}%", Program.Title, averageProgress);
+                UpdateTrayIcon((int)averageProgress);
                 TaskbarManager.SetProgressValue(Program.MainForm, (int)averageProgress);
             }
             else
             {
-                title = Program.Title;
-            }
-
-            Program.MainForm.Text = title;
-
-            if (!IsBusy)
-            {
+                Program.MainForm.Text = Program.Title;
+                UpdateTrayIcon(-1);
                 TaskbarManager.SetProgressState(Program.MainForm, TaskbarProgressBarStatus.NoProgress);
             }
         }