Fix aborting via hourglass

739752ccf315134a271c83520271b0d605636505

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

public/scripts/extensions/stable-diffusion/index.js+4 -3 Viewed

+}
 setInterval(moduleWorker, UPDATE_INTERVAL);
+let buttonAbortController = null;
 async function sdMessageButton(e) {
     function setBusyIcon(isBusy) {

     const messageText = message?.mes;
     const hasSavedImage = message?.extra?.image && message?.extra?.title;
     const hasSavedNegative = message?.extra?.negative;
-    const abortController = new AbortController();
     if ($icon.hasClass(busyClass)) {
-        abortController.abort();
+        buttonAbortController?.abort('Aborted by user');
         console.log('Previous image is still being generated...');
         return;
+    }
     let dimensions = null;
+    buttonAbortController = new AbortController();
     try {
         setBusyIcon(true);

             const generationType = message?.extra?.generationType ?? generationMode.FREE;
             console.log('Regenerating an image, using existing prompt:', prompt);
             dimensions = setTypeSpecificDimensions(generationType);
-            await sendGenerationRequest(generationType, prompt, negative, characterFileName, saveGeneratedImage, initiators.action, abortController.signal);
+            await sendGenerationRequest(generationType, prompt, negative, characterFileName, saveGeneratedImage, initiators.action, buttonAbortController?.signal);
+        }
         else {
             console.log('doing /sd raw last');