From 5d51fd50ce59fb958565bc95e7572cc61043b8b4 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 13 Sep 2018 19:27:38 +0200 Subject: merge --- app/relay/runner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/relay/runner.js') diff --git a/app/relay/runner.js b/app/relay/runner.js index 080a753..a5100af 100644 --- a/app/relay/runner.js +++ b/app/relay/runner.js @@ -311,7 +311,7 @@ export function run_task(task, preempt=false, watch=false){ export function run_task_with_activity(task, module, activity, preempt=false, watch=false) { const { interpreter, params, cancelled } = build_params(module, activity, task) - if (cancelled) return finish({ type: 'task_error', task, "Task generator cancelled task", }) + if (cancelled) return finish({ type: 'task_error', task, err: "Task generator cancelled task", }) if (! interpreter) return { type: 'error', error: "No such interpreter: " + activity.interpreter } if (interpreter.gpu && state.current_gpu_task.status !== 'IDLE') { -- cgit v1.2.3-70-g09d2