mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-02 18:26:27 +13:00
fixed #2438: When annotation disabled in region capture then after capture task "Annotate image" can be used with region capture
This commit is contained in:
parent
94a585a673
commit
c8f9526ce7
2 changed files with 2 additions and 3 deletions
|
@ -60,8 +60,6 @@ protected override ImageInfo Execute(TaskSettings taskSettings)
|
||||||
|
|
||||||
protected ImageInfo ExecuteRegionCapture(TaskSettings taskSettings)
|
protected ImageInfo ExecuteRegionCapture(TaskSettings taskSettings)
|
||||||
{
|
{
|
||||||
AllowAnnotation = false;
|
|
||||||
|
|
||||||
ImageInfo imageInfo = new ImageInfo();
|
ImageInfo imageInfo = new ImageInfo();
|
||||||
|
|
||||||
RegionCaptureMode mode;
|
RegionCaptureMode mode;
|
||||||
|
@ -73,6 +71,7 @@ protected ImageInfo ExecuteRegionCapture(TaskSettings taskSettings)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mode = RegionCaptureMode.Annotation;
|
mode = RegionCaptureMode.Annotation;
|
||||||
|
AllowAnnotation = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
RegionCaptureForm form = new RegionCaptureForm(mode);
|
RegionCaptureForm form = new RegionCaptureForm(mode);
|
||||||
|
|
|
@ -428,7 +428,7 @@ public class TaskSettingsAdvanced
|
||||||
Editor(typeof(DirectoryNameEditor), typeof(UITypeEditor))]
|
Editor(typeof(DirectoryNameEditor), typeof(UITypeEditor))]
|
||||||
public string CapturePath { get; set; }
|
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; }
|
public bool RegionCaptureDisableAnnotation { get; set; }
|
||||||
|
|
||||||
[Category("Upload"), Description("Files with these file extensions will be uploaded using image uploader."),
|
[Category("Upload"), Description("Files with these file extensions will be uploaded using image uploader."),
|
||||||
|
|
Loading…
Reference in a new issue