From 9f90167fe7d5a4cfd954843881649746572a1c7d Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 13 Sep 2018 19:26:50 +0200 Subject: merge --- app/relay/modules/pix2pixhd.js | 2 +- app/relay/runner.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/relay/modules/pix2pixhd.js b/app/relay/modules/pix2pixhd.js index 3bdf705..e05f427 100644 --- a/app/relay/modules/pix2pixhd.js +++ b/app/relay/modules/pix2pixhd.js @@ -206,7 +206,7 @@ const render_recursive = { type: 'perl', script: 'dir-to-movie.pl', params: (task) => { - if (!!task.opt.mov) { + if (!task.opt.mov) { console.log('will not render mov') return 'CANCEL' } diff --git a/app/relay/runner.js b/app/relay/runner.js index d42316d..080a753 100644 --- a/app/relay/runner.js +++ b/app/relay/runner.js @@ -311,6 +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 (! 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