Fix aborting via hourglass

739752ccf315134a271c83520271b0d605636505

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 1effb66fd6ee33072cc2a3fc7b9994220eedba6a
1 files changed, +4 -3Ignore whitespace
public/scripts/extensions/stable-diffusion/index.js+4 -3
@@ -3467,6 +3467,7 @@ async function moduleWorker() {
34673467}
34683468
34693469setInterval(moduleWorker, UPDATE_INTERVAL);
3470+let buttonAbortController = null;
34703471
34713472async function sdMessageButton(e) {
34723473 function setBusyIcon(isBusy) {
@@ -3484,15 +3485,15 @@ async function sdMessageButton(e) {
34843485 const messageText = message?.mes;
34853486 const hasSavedImage = message?.extra?.image && message?.extra?.title;
34863487 const hasSavedNegative = message?.extra?.negative;
3487- const abortController = new AbortController();
34883488
34893489 if ($icon.hasClass(busyClass)) {
34903490 abortControllerbuttonAbortController?.abort('Aborted by user');
34913491 console.log('Previous image is still being generated...');
34923492 return;
34933493 }
34943494
34953495 let dimensions = null;
3496+ buttonAbortController = new AbortController();
34963497
34973498 try {
34983499 setBusyIcon(true);
@@ -3504,7 +3505,7 @@ async function sdMessageButton(e) {
35043505 const generationType = message?.extra?.generationType ?? generationMode.FREE;
35053506 console.log('Regenerating an image, using existing prompt:', prompt);
35063507 dimensions = setTypeSpecificDimensions(generationType);
35073508 await sendGenerationRequest(generationType, prompt, negative, characterFileName, saveGeneratedImage, initiators.action, abortControllerbuttonAbortController?.signal);
35083509 }
35093510 else {
35103511 console.log('doing /sd raw last');