From 2dc5f2d7fc0ce82bf63012c33a46091e77ca8468 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Wed, 3 Apr 2024 08:18:18 +0300
Subject: [PATCH] Code refactoring

---
 ShareX/QuickTaskInfo.cs | 18 ++++++++++++++++++
 ShareX/QuickTaskMenu.cs | 20 ++------------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/ShareX/QuickTaskInfo.cs b/ShareX/QuickTaskInfo.cs
index 1a89e0e6d..ea550418d 100644
--- a/ShareX/QuickTaskInfo.cs
+++ b/ShareX/QuickTaskInfo.cs
@@ -25,6 +25,7 @@
 
 using ShareX.HelpersLib;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 
 namespace ShareX
@@ -43,6 +44,23 @@ public bool IsValid
             }
         }
 
+        public Image Icon
+        {
+            get
+            {
+                IEnumerable<AfterCaptureTasks> flags = AfterCaptureTasks.GetFlags();
+
+                if (flags.Count() > 0)
+                {
+                    AfterCaptureTasks last = flags.Last();
+
+                    return TaskHelpers.FindMenuIcon(last);
+                }
+
+                return null;
+            }
+        }
+
         public static List<QuickTaskInfo> DefaultPresets => new List<QuickTaskInfo>()
         {
             new QuickTaskInfo("Save, Upload, Copy URL", AfterCaptureTasks.SaveImageToFile | AfterCaptureTasks.UploadImageToHost, AfterUploadTasks.CopyURLToClipboard),
diff --git a/ShareX/QuickTaskMenu.cs b/ShareX/QuickTaskMenu.cs
index 9a27124c1..982f7402e 100644
--- a/ShareX/QuickTaskMenu.cs
+++ b/ShareX/QuickTaskMenu.cs
@@ -25,9 +25,7 @@
 
 using ShareX.HelpersLib;
 using ShareX.Properties;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 using System.Windows.Forms;
 
 namespace ShareX
@@ -71,11 +69,11 @@ public void ShowMenu()
                     if (taskInfo.IsValid)
                     {
                         ToolStripMenuItem tsmi = new ToolStripMenuItem { Text = taskInfo.ToString().Replace("&", "&&"), Tag = taskInfo };
-                        tsmi.Image = FindSuitableIcon(taskInfo);
+                        tsmi.Image = taskInfo.Icon;
                         tsmi.Click += (sender, e) =>
                         {
-                            QuickTaskInfo selectedTaskInfo = ((ToolStripMenuItem)sender).Tag as QuickTaskInfo;
                             cms.Close();
+                            QuickTaskInfo selectedTaskInfo = ((ToolStripMenuItem)sender).Tag as QuickTaskInfo;
                             OnTaskInfoSelected(selectedTaskInfo);
                         };
                         cms.Items.Add(tsmi);
@@ -122,19 +120,5 @@ protected void OnTaskInfoSelected(QuickTaskInfo taskInfo)
         {
             TaskInfoSelected?.Invoke(taskInfo);
         }
-
-        public Image FindSuitableIcon(QuickTaskInfo taskInfo)
-        {
-            IEnumerable<AfterCaptureTasks> afterCaptureTasks = taskInfo.AfterCaptureTasks.GetFlags();
-
-            if (afterCaptureTasks.Count() > 0)
-            {
-                AfterCaptureTasks last = afterCaptureTasks.Last();
-
-                return TaskHelpers.FindMenuIcon(last);
-            }
-
-            return null;
-        }
     }
 }
\ No newline at end of file