fix: Stopping the renderer resolves in-process dice rolls (close #285)

javalent · Jan 3, 2024 · 74d33c6 · 74d33c6
1 parent 06a55a5
commit 74d33c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/renderer/renderer.ts b/src/renderer/renderer.ts
@@ -407,8 +407,14 @@ export default class DiceRenderer extends Component {
     }
     stop() {
         if (this.#animating) {
-            for (const dice of [...this.#current].flat()) {
-                dice.stopped = true;
+            for (const shape of [...this.#current]) {
+                if (this.#finished.has(shape)) {
+                    this.#finished.get(shape)();
+                    this.#finished.delete(shape);
+                }
+                for (const dice of shape) {
+                    dice.stopped = true;
+                }
             }
         }
         this.#animating = false;

diff --git a/src/roller/dice.ts b/src/roller/dice.ts
@@ -1113,8 +1113,6 @@ export class StackRoller extends GenericRoller<number> {
         }
         if (evt.getModifierState("Shift")) {
             await this.roll(true);
-            /* this.render();
-            this.trigger("new-result"); */
             this.hasRunOnce = true;
         } else if (window.getSelection()?.isCollapsed) {
             await this.roll();