From ea5830f6fe2db3ea0f75fc30d5bd5e81eaffe4d4 Mon Sep 17 00:00:00 2001 From: Adrien Allard Date: Sat, 14 Nov 2020 15:30:04 +0100 Subject: [PATCH] Fixed: Issue where cancel button was always disabled --- .../FileConverter/ConversionJobs/ConversionJob.cs | 9 +++------ .../FileConverter/ConversionJobs/ConversionJob_Excel.cs | 5 +---- .../FileConverter/ConversionJobs/ConversionJob_Office.cs | 5 +---- .../ConversionJobs/ConversionJob_PowerPoint.cs | 5 +---- .../FileConverter/ConversionJobs/ConversionJob_Word.cs | 5 +---- 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/Application/FileConverter/ConversionJobs/ConversionJob.cs b/Application/FileConverter/ConversionJobs/ConversionJob.cs index 5852a9f..1374e64 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob.cs @@ -207,6 +207,8 @@ namespace FileConverter.ConversionJobs } } + protected virtual bool IsCancelable => this.State == ConversionState.InProgress; + protected string[] OutputFilePaths { get; @@ -376,7 +378,7 @@ namespace FileConverter.ConversionJobs public virtual void Cancel() { - if (!this.IsCancelable()) + if (!this.IsCancelable) { return; } @@ -385,11 +387,6 @@ namespace FileConverter.ConversionJobs this.ConversionFailed(Properties.Resources.ErrorCanceled); } - protected virtual bool IsCancelable() - { - return this.State == ConversionState.InProgress; - } - protected virtual int GetOutputFilesCount() { return 1; diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs index a3d33ba..356e0bb 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Excel.cs @@ -34,10 +34,7 @@ namespace FileConverter.ConversionJobs } } - protected override bool IsCancelable() - { - return false; - } + protected override bool IsCancelable => false; protected override int GetOutputFilesCount() { diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs index 60e5d50..567dd63 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Office.cs @@ -26,10 +26,7 @@ namespace FileConverter.ConversionJobs get; } - protected override bool IsCancelable() - { - return false; - } + protected override bool IsCancelable => false; protected override void Initialize() { diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs b/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs index 2a30c42..f799237 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_PowerPoint.cs @@ -35,10 +35,7 @@ namespace FileConverter.ConversionJobs } } - protected override bool IsCancelable() - { - return false; - } + protected override bool IsCancelable => false; protected override int GetOutputFilesCount() { diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs index 5721896..544eaef 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Word.cs @@ -34,10 +34,7 @@ namespace FileConverter.ConversionJobs } } - protected override bool IsCancelable() - { - return false; - } + protected override bool IsCancelable => false; protected override int GetOutputFilesCount() {