Mercurial > pub > ImplabNet

diff Implab/FuncChainTask.cs @ 190:1c2a16d071a7 v2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние с ref20160224
author cin
date Fri, 22 Apr 2016 13:08:08 +0300
parents dd4a3590f9c6
children 40d7fed4a09e
line wrap: on
line diff
--- a/Implab/FuncChainTask.cs	Fri Feb 19 18:07:17 2016 +0300
+++ b/Implab/FuncChainTask.cs	Fri Apr 22 13:08:08 2016 +0300
@@ -13,8 +13,10 @@
             if (m_task != null && LockCancelation()) {
                 try {
                     var operation = m_task();
-                    operation.On(SetResult, HandleErrorInternal, SetCancelled);
+                    operation.On(SetResult, HandleErrorInternal, HandleCancelInternal);
                     CancellationRequested(operation.Cancel);
+                } catch (OperationCanceledException reason) {
+                    HandleCancelInternal(reason);
                 } catch (Exception err) {
                     HandleErrorInternal(err);
                 }