From d492d3f7387ea5ca31b6f79c30a0c21b63f783da Mon Sep 17 00:00:00 2001
From: patriceac <48073125+patriceac@users.noreply.github.com>
Date: Sun, 30 Oct 2022 00:22:01 -0700
Subject: [PATCH] Update main.js

Fixing the parsing of Set and Permute operators in custom tags.
---
 ui/media/js/main.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 3c5f27dc..b6510f3f 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -886,15 +886,15 @@ function getPrompts() {
     prompts = prompts.map(prompt => prompt.trim())
     prompts = prompts.filter(prompt => prompt !== '')
 
+    if (activeTags.length > 0) {
+		const promptTags = activeTags.map(x => x.name).join(", ")
+		prompts = prompts.map((prompt) => `${prompt}, ${promptTags}`)
+    }
+	
     let promptsToMake = applySetOperator(prompts)
     promptsToMake = applyPermuteOperator(promptsToMake)
 
-    if (activeTags.length <= 0) {
-        return promptsToMake
-    }
-
-    const promptTags = activeTags.map(x => x.name).join(", ")
-    return promptsToMake.map((prompt) => `${prompt}, ${promptTags}`)
+    return promptsToMake
 }
 
 function applySetOperator(prompts) {