Merge branch 'master' of github.com:GridSpace/grid-apps

2021-02-24 12:28:24 -05:00 · 2021-02-24 12:28:24 -05:00 · 2fa1bccca8
commit 2fa1bccca8
parent c628383a10 18fded64db
8 changed files with 39 additions and 19 deletions
--- a/src/kiri/init.js
+++ b/src/kiri/init.js
@ -242,7 +242,8 @@
                // hide all dialogs
                API.dialog.hide();
                // cancel slicing
-                if (KIRI.work.isSlicing()) KIRI.work.restart();
+                API.function.cancel();
+                // if (KIRI.work.isSlicing()) KIRI.work.restart();
                // kill any poppers in compact mode
                UC.hidePoppers();
                // and send an event (used by FDM client)