From b5842ed4d0d8956b0684d307d26fcc7094c6f3f4 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Tue, 2 Feb 2021 11:46:48 -0500 Subject: [PATCH] fix cancel slicing cleanup --- src/kiri/main.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/kiri/main.js b/src/kiri/main.js index ad8f4ced..faf632e3 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -898,9 +898,12 @@ } API.event.emit('slice', getMode()); } + let alert = null; // on the last exit, update ui and call the callback if (--countdown === 0 || error || errored) { - let alert = scale === 1 && feature.work_alerts ? API.show.alert("Rendering") : null; + if (scale === 1 && feature.work_alerts) { + alert = API.show.alert("Rendering"); + }; KIRI.client.unrotate(settings, () => { forAllWidgets(widget => { // on done @@ -936,11 +939,13 @@ } // handle slicing errors if (error && !errored) { + API.show.progress(0); + API.hide.alert(alert); errored = true; setViewMode(VIEWS.ARRANGE); setOpacity(color.model_opacity); platform.deselect(); - alert2(error); + alert2(error, 1); } }, function(update, msg) { if (msg && msg !== lastMsg) {