From c8f9526ce7b193bc8aa92c89781cbd08fc14b13c Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 14 May 2017 01:58:22 +0300 Subject: [PATCH] fixed #2438: When annotation disabled in region capture then after capture task "Annotate image" can be used with region capture --- ShareX/CaptureHelpers/CaptureRegion.cs | 3 +-- ShareX/TaskSettings.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ShareX/CaptureHelpers/CaptureRegion.cs b/ShareX/CaptureHelpers/CaptureRegion.cs index aa58e8447..d71116b98 100644 --- a/ShareX/CaptureHelpers/CaptureRegion.cs +++ b/ShareX/CaptureHelpers/CaptureRegion.cs @@ -60,8 +60,6 @@ protected override ImageInfo Execute(TaskSettings taskSettings) protected ImageInfo ExecuteRegionCapture(TaskSettings taskSettings) { - AllowAnnotation = false; - ImageInfo imageInfo = new ImageInfo(); RegionCaptureMode mode; @@ -73,6 +71,7 @@ protected ImageInfo ExecuteRegionCapture(TaskSettings taskSettings) else { mode = RegionCaptureMode.Annotation; + AllowAnnotation = false; } RegionCaptureForm form = new RegionCaptureForm(mode); diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs index 6b7127819..7c95c815e 100644 --- a/ShareX/TaskSettings.cs +++ b/ShareX/TaskSettings.cs @@ -428,7 +428,7 @@ public class TaskSettingsAdvanced Editor(typeof(DirectoryNameEditor), typeof(UITypeEditor))] public string CapturePath { get; set; } - [Category("Capture"), DefaultValue(false), Description("Disable annotation support in region capture.")] + [Category("Capture"), DefaultValue(false), Description("Disable annotation support in region capture. Also allows after capture task \"Annotate image\" to work with region capture.")] public bool RegionCaptureDisableAnnotation { get; set; } [Category("Upload"), Description("Files with these file extensions will be uploaded using image uploader."),