From b0793912bbb75ff5791ef69af1db527e12c27699 Mon Sep 17 00:00:00 2001 From: rutriff Date: Thu, 14 Mar 2019 12:52:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=20=D1=82=D0=BE=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=D0=B8=D0=BB,=20=D0=B2?= =?UTF-8?q?=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20ThrowIfCancellationRequested,?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE=20return?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs index 10e219d..211a96d 100644 --- a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs +++ b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs @@ -27,7 +27,10 @@ namespace JiraTimeBotForm.TaskTime foreach (var repoDirectory in Directory.GetDirectories(settings.RepositoryPath)) { - cancellationToken.ThrowIfCancellationRequested(); + if (cancellationToken.IsCancellationRequested) + { + return workTimeItems; + } //var project = new DirectoryInfo(repoDirectory).Name; if (!Directory.Exists(Path.Combine(repoDirectory, ".hg"))) @@ -46,7 +49,10 @@ namespace JiraTimeBotForm.TaskTime foreach (var changeset in log) { - cancellationToken.ThrowIfCancellationRequested(); + if (cancellationToken.IsCancellationRequested) + { + return workTimeItems; + } if (!changeset.Branch.Contains("-")) {