From ea95c52fac0f6c306ad7cc92b4e7bc313fa45a56 Mon Sep 17 00:00:00 2001 From: Guillaume Chau Date: Wed, 23 May 2018 16:49:15 +0200 Subject: [PATCH] fix(ui): task terminated status on Windows --- packages/@vue/cli-ui/src/graphql-api/connectors/tasks.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/@vue/cli-ui/src/graphql-api/connectors/tasks.js b/packages/@vue/cli-ui/src/graphql-api/connectors/tasks.js index 01e852c49c..1c88f94a80 100644 --- a/packages/@vue/cli-ui/src/graphql-api/connectors/tasks.js +++ b/packages/@vue/cli-ui/src/graphql-api/connectors/tasks.js @@ -217,6 +217,9 @@ function updateViewBadges ({ task, data }, context) { async function run (id, context) { const task = findOne(id, context) if (task && task.status !== 'running') { + task._terminating = false + + // Answers const answers = prompts.getAnswers() let args = task.fullCommand ? [] : ['run', task.name] let command = task.fullCommand ? task.command : getCommand() @@ -304,7 +307,7 @@ async function run (id, context) { }) } - if (code === null) { + if (code === null || task._terminating) { updateOne({ id: task.id, status: 'terminated' @@ -361,6 +364,7 @@ async function run (id, context) { function stop (id, context) { const task = findOne(id, context) if (task && task.status === 'running' && task.child) { + task._terminating = true terminate(task.child.pid) } return task