From bd10a850fa3fda91eb84b39bcb4d9ab68fb7a0bb Mon Sep 17 00:00:00 2001
From: patriceac <48073125+patriceac@users.noreply.github.com>
Date: Sat, 3 Dec 2022 08:55:14 -0800
Subject: [PATCH] Fix upscaling when a source image is set (#593)

* Fix upscaling when a source image is set

If you have an image selected (img2img) then clicking Upscale on another unrelated image, the image for img2img is used and you get something very unexpected.

* Fix for img2img and mask gens
---
 ui/media/js/main.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 945c930b..bac12087 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -387,9 +387,28 @@ function enqueueImageVariationTask(req, img, reqDiff) {
 }
 
 function onUpscaleClick(req, img) {
-    enqueueImageVariationTask(req, img, {
-        use_upscale: upscaleModelField.value
-    })
+    if (IMAGE_REGEX.test(req.init_image) && IMAGE_REGEX.test(req.mask)) {
+        enqueueImageVariationTask(req, img, {
+            use_upscale: upscaleModelField.value,
+            init_image: req.init_image,
+            mask: req.mask
+        })
+    }
+    else if (IMAGE_REGEX.test(req.init_image)) {
+        enqueueImageVariationTask(req, img, {
+            use_upscale: upscaleModelField.value,
+            init_image: req.init_image,
+            mask: undefined
+        })
+    }
+    else
+    {
+        enqueueImageVariationTask(req, img, {
+            use_upscale: upscaleModelField.value,
+            init_image: undefined,
+            mask: undefined
+        })
+    }
 }
 
 function onFixFacesClick(req, img) {