Image Generation: Fix race condition in adding images to chat

8ff9ef3610f7eb1b793062528f6b548859f54431

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

Parents: bc5e7b1ee88d5d080bd487156c3ddcdd626de99a
1 files changed, +5 -3Showing whitespace changes
public/scripts/extensions/stable-diffusion/index.js+5 -3
@@ -2305,9 +2305,9 @@ async function generatePicture(initiator, args, trigger, message, callback) {
2305 eventSource.emit(event_types.FORCE_SET_BACKGROUND, { url: imgUrl, path: imagePath });2305 eventSource.emit(event_types.FORCE_SET_BACKGROUND, { url: imgUrl, path: imagePath });
23062306
2307 if (typeof callbackOriginal === 'function') {2307 if (typeof callbackOriginal === 'function') {
2308 callbackOriginal(prompt, imagePath, generationType, negativePromptPrefix, initiator);2308 await callbackOriginal(prompt, imagePath, generationType, negativePromptPrefix, initiator);
2309 } else {2309 } else {
2310 sendMessage(prompt, imagePath, generationType, negativePromptPrefix, initiator);2310 await sendMessage(prompt, imagePath, generationType, negativePromptPrefix, initiator);
2311 }2311 }
2312 };2312 };
2313 }2313 }
@@ -2636,7 +2636,9 @@ async function sendGenerationRequest(generationType, prompt, additionalNegativeP
26362636
2637 const filename = `${characterName}_${humanizedDateTime()}`;2637 const filename = `${characterName}_${humanizedDateTime()}`;
2638 const base64Image = await saveBase64AsFile(result.data, characterName, filename, result.format);2638 const base64Image = await saveBase64AsFile(result.data, characterName, filename, result.format);
2639 callback ? callback(prompt, base64Image, generationType, additionalNegativePrefix, initiator) : sendMessage(prompt, base64Image, generationType, additionalNegativePrefix, initiator);2639 callback
2640 ? await callback(prompt, base64Image, generationType, additionalNegativePrefix, initiator)
2641 : await sendMessage(prompt, base64Image, generationType, additionalNegativePrefix, initiator);
2640 return base64Image;2642 return base64Image;
2641}2643}
26422644