From 22b6abfd8b46eee914d945582c348a4c691ec73b Mon Sep 17 00:00:00 2001 From: Simon Voordouw Date: Thu, 6 Jul 2017 14:11:59 +0200 Subject: [PATCH] stop fetch program in printer/{fetch,print}. Fixes issue #74 --- src/rest/api/api_printer.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/rest/api/api_printer.lua b/src/rest/api/api_printer.lua index f70cd75..ad091b2 100644 --- a/src/rest/api/api_printer.lua +++ b/src/rest/api/api_printer.lua @@ -71,6 +71,9 @@ local function getCurrentPrint() end end +local function stopFetch() + io.popen("killall print-fetch") +end function M.progress(request, response) local argId = request:get("id") @@ -186,7 +189,7 @@ function M.stop_POST(request, response) local printer,msg = printerUtils.createPrinterOrFail(argId, response) if not printer or not printer:hasSocket() then return end - io.popen("killall print-fetch") + stopFetch() io.popen("rm /tmp/startcode /tmp/endcode") setCurrentPrint(nil) @@ -246,7 +249,7 @@ function M.fetch_POST(request, response) log:verbose(MOD_ABBR, " clearing all gcode for " .. printer:getId()) - response:addData('gcode_clear',true) + stopFetch() local rv,msg = printer:clearGcode() if rv == false then @@ -344,6 +347,8 @@ function M.print_POST(request, response) local printer,msg = printerUtils.createPrinterOrFail(argId, response) if not printer or not printer:hasSocket() then return end + stopFetch() + response:addData('id', argId) if argGcode == nil or argGcode == '' then