From 83f998c57623f9b8c5f3cc65f204a4c99e080bd1 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Fri, 1 Apr 2016 13:11:43 +0300
Subject: [PATCH] Proper event usage in WebpageCaptureForm

---
 .../Forms/ScrollingCaptureForm.cs             | 10 +++++-----
 .../Forms/WebpageCaptureForm.cs               | 20 +++++++++++++++++--
 ShareX/TaskHelpers.cs                         |  8 ++++----
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs
index 639305ba8..108bb9afe 100644
--- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs
+++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs
@@ -37,7 +37,7 @@ namespace ShareX.ScreenCaptureLib
 {
     public partial class ScrollingCaptureForm : Form
     {
-        public event Action<Image> ProcessRequested;
+        public event Action<Image> ImageProcessRequested;
 
         public ScrollingCaptureOptions Options { get; set; }
         public Image Result { get; set; }
@@ -96,11 +96,11 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
         }
 
-        protected void OnProcessRequested(Image image)
+        protected void OnImageProcessRequested(Image img)
         {
-            if (ProcessRequested != null)
+            if (ImageProcessRequested != null)
             {
-                ProcessRequested(image);
+                ImageProcessRequested(img);
             }
         }
 
@@ -543,7 +543,7 @@ private void StartProcess()
         {
             if (Result != null)
             {
-                OnProcessRequested((Image)Result.Clone());
+                OnImageProcessRequested((Image)Result.Clone());
             }
         }
 
diff --git a/ShareX.ScreenCaptureLib/Forms/WebpageCaptureForm.cs b/ShareX.ScreenCaptureLib/Forms/WebpageCaptureForm.cs
index a4ca982b1..4a2d3b02b 100644
--- a/ShareX.ScreenCaptureLib/Forms/WebpageCaptureForm.cs
+++ b/ShareX.ScreenCaptureLib/Forms/WebpageCaptureForm.cs
@@ -33,8 +33,8 @@ namespace ShareX.ScreenCaptureLib
 {
     public partial class WebpageCaptureForm : Form
     {
-        public event Action<Image> OnImageUploadRequested;
-        public event Action<Image> OnImageCopyRequested;
+        public event Action<Image> ImageUploadRequested;
+        public event Action<Image> ImageCopyRequested;
 
         public WebpageCaptureOptions Options { get; set; }
         public bool IsBusy { get; private set; }
@@ -166,6 +166,22 @@ private void UpdateControls()
             btnCapture.Enabled = txtURL.TextLength > 0;
         }
 
+        protected void OnImageUploadRequested(Image img)
+        {
+            if (ImageUploadRequested != null)
+            {
+                ImageUploadRequested(img);
+            }
+        }
+
+        protected void OnImageCopyRequested(Image img)
+        {
+            if (ImageCopyRequested != null)
+            {
+                ImageCopyRequested(img);
+            }
+        }
+
         private void btnUpload_Click(object sender, EventArgs e)
         {
             if (pbResult.Image != null)
diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs
index 4b5b19ced..24f2564c9 100644
--- a/ShareX/TaskHelpers.cs
+++ b/ShareX/TaskHelpers.cs
@@ -430,7 +430,7 @@ public static void OpenScrollingCapture(TaskSettings taskSettings = null, bool f
             if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
 
             ScrollingCaptureForm scrollingCaptureForm = new ScrollingCaptureForm(taskSettings.CaptureSettingsReference.ScrollingCaptureOptions, forceSelection);
-            scrollingCaptureForm.ProcessRequested += image => UploadManager.RunImageTask(image, taskSettings);
+            scrollingCaptureForm.ImageProcessRequested += img => UploadManager.RunImageTask(img, taskSettings);
             scrollingCaptureForm.Show();
         }
 
@@ -444,8 +444,8 @@ public static void OpenWebpageCapture(TaskSettings taskSettings = null)
             if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
 
             WebpageCaptureForm webpageCaptureForm = new WebpageCaptureForm(Program.Settings.WebpageCaptureOptions);
-            webpageCaptureForm.OnImageUploadRequested += img => UploadManager.RunImageTask(img, taskSettings);
-            webpageCaptureForm.OnImageCopyRequested += img =>
+            webpageCaptureForm.ImageUploadRequested += img => UploadManager.RunImageTask(img, taskSettings);
+            webpageCaptureForm.ImageCopyRequested += img =>
             {
                 using (img)
                 {
@@ -601,7 +601,7 @@ public static void OpenImageCombiner(TaskSettings taskSettings = null)
             if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
 
             ImageCombinerForm imageCombinerForm = new ImageCombinerForm(taskSettings.ToolsSettingsReference.ImageCombinerOptions);
-            imageCombinerForm.ProcessRequested += image => UploadManager.RunImageTask(image, taskSettings);
+            imageCombinerForm.ProcessRequested += img => UploadManager.RunImageTask(img, taskSettings);
             imageCombinerForm.Show();
         }