From 0302686a962c75fdcc7636c08232d3269e767c17 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Mon, 11 Dec 2023 19:07:33 +0200
Subject: [PATCH] Return from Generate if calling circuit breaker

---
 public/script.js                                    | 1 +
 public/scripts/extensions/stable-diffusion/index.js | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/script.js b/public/script.js
index c88e730e3..e4ff2e0ad 100644
--- a/public/script.js
+++ b/public/script.js
@@ -3880,6 +3880,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
                                 const result = await await Generate(type, { automatic_trigger, force_name2: true, quiet_prompt, skipWIAN, force_chid, maxLoops: maxLoops - 1 });
                                 resolve(result);
                             });
+                            return;
                         }
 
                         if (power_user.auto_swipe) {
diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index b5c885c8c..9935d43e4 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -1781,13 +1781,14 @@ async function generateMultimodalPrompt(generationType, quietPrompt) {
  */
 async function generatePrompt(quietPrompt) {
     const reply = await generateQuietPrompt(quietPrompt, false, false);
+    const processedReply = processReply(reply);
 
-    if (!reply) {
+    if (!processedReply) {
         toastr.error('Prompt generation produced no text. Make sure you\'re using a valid instruct template and try again', 'Image Generation');
         throw new Error('Prompt generation failed.');
     }
 
-    return processReply(reply);
+    return processedReply;
 }
 
 async function sendGenerationRequest(generationType, prompt, characterName = null, callback) {