rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix aborting via hourglass

Browse Source
This commit is contained in:
Cohee
2024-07-18 23:32:20 +03:00
parent 1effb66fd6
commit 739752ccf3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/scripts/extensions/stable-diffusion/index.js
View File

@@ -3467,6 +3467,7 @@ async function moduleWorker() {
} }
setInterval(moduleWorker, UPDATE_INTERVAL); setInterval(moduleWorker, UPDATE_INTERVAL);
let buttonAbortController = null;
async function sdMessageButton(e) { async function sdMessageButton(e) {
function setBusyIcon(isBusy) { function setBusyIcon(isBusy) {
@@ -3484,15 +3485,15 @@ async function sdMessageButton(e) {
const messageText = message?.mes; const messageText = message?.mes;
const hasSavedImage = message?.extra?.image && message?.extra?.title; const hasSavedImage = message?.extra?.image && message?.extra?.title;
const hasSavedNegative = message?.extra?.negative; const hasSavedNegative = message?.extra?.negative;
const abortController = new AbortController();
if ($icon.hasClass(busyClass)) { if ($icon.hasClass(busyClass)) {
abortController.abort(); buttonAbortController?.abort('Aborted by user');
console.log('Previous image is still being generated...'); console.log('Previous image is still being generated...');
return; return;
} }
let dimensions = null; let dimensions = null;
buttonAbortController = new AbortController();
try { try {
setBusyIcon(true); setBusyIcon(true);
@@ -3504,7 +3505,7 @@ async function sdMessageButton(e) {
const generationType = message?.extra?.generationType ?? generationMode.FREE; const generationType = message?.extra?.generationType ?? generationMode.FREE;
console.log('Regenerating an image, using existing prompt:', prompt); console.log('Regenerating an image, using existing prompt:', prompt);
dimensions = setTypeSpecificDimensions(generationType); 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 { else {
console.log('doing /sd raw last'); console.log('doing /sd raw last');