From abbb3609c8f840caf2cd654ed43a0bed5db59466 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Sun, 16 Feb 2025 07:59:30 +1000 Subject: [PATCH] fix(ui): race condition that causes non-user-facing error when handling canvas filter cancelations The abortController could be null by the time we attempt to abort it --- .../konva/CanvasEntity/CanvasEntityFilterer.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasEntity/CanvasEntityFilterer.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasEntity/CanvasEntityFilterer.ts index 8436f28c25..517a4998a8 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasEntity/CanvasEntityFilterer.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasEntity/CanvasEntityFilterer.ts @@ -284,8 +284,8 @@ export class CanvasEntityFilterer extends CanvasModuleBase { this.log.error({ error: serializeError(filterResult.error) }, 'Error filtering'); this.$isProcessing.set(false); // Clean up the abort controller as needed - if (!this.abortController.signal.aborted) { - this.abortController.abort(); + if (!controller.signal.aborted) { + controller.abort(); } this.abortController = null; return; @@ -324,8 +324,8 @@ export class CanvasEntityFilterer extends CanvasModuleBase { this.$isProcessing.set(false); // Clean up the abort controller as needed - if (!this.abortController.signal.aborted) { - this.abortController.abort(); + if (!controller.signal.aborted) { + controller.abort(); } this.abortController = null;