From 903acff924af4531bff907710c69a91265a0347d Mon Sep 17 00:00:00 2001
From: patriceac <48073125+patriceac@users.noreply.github.com>
Date: Thu, 10 Nov 2022 18:36:39 -0800
Subject: [PATCH 01/20] Adding Use Settings

---
 ui/media/css/main.css          | 10 ++++++
 ui/media/js/image-modifiers.js | 54 +++++++++++++++++++++++++++++++-
 ui/media/js/main.js            | 57 +++++++++++++++++++++++++++++-----
 3 files changed, 113 insertions(+), 8 deletions(-)

diff --git a/ui/media/css/main.css b/ui/media/css/main.css
index da87216d..33d18177 100644
--- a/ui/media/css/main.css
+++ b/ui/media/css/main.css
@@ -428,6 +428,16 @@ img {
 .secondaryButton:hover {
     background: rgb(177, 27, 0);
 }
+.useSettings {
+    background: var(--accent-color);
+    border: var(--make-image-border);
+    color: rgb(255, 221, 255);
+    margin-right: 6pt;
+    float: right;
+}
+.useSettings:hover {
+    background: hsl(var(--accent-hue), 100%, calc(var(--accent-lightness) + 6%));
+}
 .stopTask {
     float: right;
 }
diff --git a/ui/media/js/image-modifiers.js b/ui/media/js/image-modifiers.js
index 12bdd65f..8cf26a49 100644
--- a/ui/media/js/image-modifiers.js
+++ b/ui/media/js/image-modifiers.js
@@ -148,6 +148,58 @@ async function loadModifiers() {
     loadCustomModifiers()
 }
 
+function refreshModifiersState(newTags) {
+    // clear existing modifiers
+    document.querySelector('#editor-modifiers').querySelectorAll('.modifier-card').forEach(modifierCard => {
+        const modifierName = modifierCard.querySelector('.modifier-card-label').innerText
+        if (activeTags.map(x => x.name).includes(modifierName)) {
+            modifierCard.classList.remove(activeCardClass)
+            modifierCard.querySelector('.modifier-card-image-overlay').innerText = '+'
+        }
+    })
+    activeTags = []
+
+    // set new modifiers
+    newTags.forEach(tag => {
+        let found = false
+        document.querySelector('#editor-modifiers').querySelectorAll('.modifier-card').forEach(modifierCard => {
+            const modifierName = modifierCard.querySelector('.modifier-card-label').innerText
+            if (tag == modifierName) {
+                // add modifier to active array
+                activeTags.push({
+                    'name': modifierName,
+                    'element': modifierCard.cloneNode(true),
+                    'originElement': modifierCard
+                })
+                modifierCard.classList.add(activeCardClass)
+                modifierCard.querySelector('.modifier-card-image-overlay').innerText = '-'
+                found = true
+            }
+        })
+        if (found == false) { // custom tag went missing, create one here
+            let modifierCard = createModifierCard(tag, undefined) // create a modifier card for the missing tag, no image
+            
+            modifierCard.addEventListener('click', () => {
+                if (activeTags.map(x => x.name).includes(tag)) {
+                    // remove modifier from active array
+                    activeTags = activeTags.filter(x => x.name != tag)
+                    modifierCard.classList.remove(activeCardClass)
+
+                    modifierCard.querySelector('.modifier-card-image-overlay').innerText = '+'
+                }
+                refreshTagsList()
+            })
+
+            activeTags.push({
+                'name': tag,
+                'element': modifierCard,
+                'originElement': undefined  // no origin element for missing tags
+            })
+        }
+    })
+    refreshTagsList()
+}
+
 function refreshTagsList() {
     editorModifierTagsList.innerHTML = ''
 
@@ -167,7 +219,7 @@ function refreshTagsList() {
         tag.element.addEventListener('click', () => {
             let idx = activeTags.indexOf(tag)
 
-            if (idx !== -1) {
+            if (idx !== -1 && activeTags[idx].originElement !== undefined) {
                 activeTags[idx].originElement.classList.remove(activeCardClass)
                 activeTags[idx].originElement.querySelector('.modifier-card-image-overlay').innerText = '+'
 
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index b326dee3..f6103eba 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -780,7 +780,9 @@ function getCurrentUserRequest() {
             stream_progress_updates: true,
             stream_image_progress: (numOutputsTotal > 50 ? false : streamImageProgressField.checked),
             show_only_filtered_image: showOnlyFilteredImageField.checked,
-            output_format: outputFormatField.value
+            output_format: outputFormatField.value,
+            original_prompt: promptField.value,
+            active_tags: (activeTags.map(x => x.name))
         }
     }
     if (IMAGE_REGEX.test(initImagePreview.src)) {
@@ -855,6 +857,7 @@ function createTask(task) {
     taskEntry.innerHTML = ` <div class="header-content panel collapsible active">
                                 <div class="taskStatusLabel">Enqueued</div>
                                 <button class="secondaryButton stopTask"><i class="fa-solid fa-trash-can"></i> Remove</button>
+                            <button class="secondaryButton useSettings"><i class="fa-solid fa-redo"></i> Use Settings</button>
                                 <div class="preview-prompt collapsible active"></div>
                                 <div class="taskConfig">${taskConfig}</div>
                                 <div class="outputMsg"></div>
@@ -893,6 +896,47 @@ function createTask(task) {
         }
     })
 
+    task['useSettings'] = taskEntry.querySelector('.useSettings')
+    task['useSettings'].addEventListener('click', async function(e) {
+        TASK_REQ_NO_EXPORT.forEach((key) => delete task.reqBody[key]) // don't restore system settings when restoring tasks
+        restoreTaskToUI(task)
+        e.stopPropagation();
+
+        // restore the original tag
+        promptField.value = task.reqBody.original_prompt
+
+        // Restore modifiers
+        refreshModifiersState(task.reqBody.active_tags)
+
+        // properly reset checkboxes
+        if (!('use_face_correction' in task.reqBody)) {
+            useFaceCorrectionField.checked = false
+        }
+        if (!('use_upscale' in task.reqBody)) {
+            useUpscalingField.checked = false
+        }
+        if (!('mask' in task.reqBody)) {
+            maskSetting.checked = false
+        }
+
+        // Show the source picture if present
+        initImagePreview.src = (task.reqBody.init_image == undefined ? '' : task.reqBody.init_image)
+        if (IMAGE_REGEX.test(initImagePreview.src)) {
+            Boolean(task.reqBody.mask) ? inpaintingEditor.setImg(task.reqBody.mask) : inpaintingEditor.resetBackground()
+            initImagePreviewContainer.style.display = 'block'
+            inpaintingEditorContainer.style.display = 'none'
+            promptStrengthContainer.style.display = 'table-row'
+            //samplerSelectionContainer.style.display = 'none'
+            // maskSetting.checked = false
+            inpaintingEditorContainer.style.display = maskSetting.checked ? 'block' : 'none'
+        } else {
+            initImagePreviewContainer.style.display = 'none'
+            // inpaintingEditorContainer.style.display = 'none'
+            promptStrengthContainer.style.display = 'none'
+            // maskSetting.style.display = 'none'
+        }
+    })
+
     imagePreview.insertBefore(taskEntry, previewTools.nextSibling)
 
     task.previewPrompt.innerText = task.reqBody.prompt
@@ -913,15 +957,14 @@ 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) {

From 332f2b0678e05ed4c496d6c74cfad66d555abb44 Mon Sep 17 00:00:00 2001
From: patriceac <48073125+patriceac@users.noreply.github.com>
Date: Sat, 12 Nov 2022 19:04:23 -0800
Subject: [PATCH 02/20] Hotfix for CSS layout regression

---
 ui/media/css/main.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/media/css/main.css b/ui/media/css/main.css
index d878fa19..33d18177 100644
--- a/ui/media/css/main.css
+++ b/ui/media/css/main.css
@@ -28,7 +28,6 @@ label {
     font-size: 13px;
     margin-bottom: 6px;
     margin-top: 5px;
-    display: block;
 }
 .image_preview_container {
     margin-top: 10pt;
@@ -657,9 +656,9 @@ input::file-selector-button {
 }
 
 @media (min-width: 700px) {
-    /* #editor {
+    #editor {
         max-width: 480px;
-    } */
+    }
     .float-container {
         padding: 20px;
     }

From a6f3e87921ec157cea3beec350e3d3c6a21f4df8 Mon Sep 17 00:00:00 2001
From: patriceac <48073125+patriceac@users.noreply.github.com>
Date: Wed, 16 Nov 2022 00:35:02 -0800
Subject: [PATCH 03/20] Image modifiers drag-and-drop plugin

---
 ui/plugins/ui/modifiers-dnd.plugin.js | 100 ++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 ui/plugins/ui/modifiers-dnd.plugin.js

diff --git a/ui/plugins/ui/modifiers-dnd.plugin.js b/ui/plugins/ui/modifiers-dnd.plugin.js
new file mode 100644
index 00000000..9406cf82
--- /dev/null
+++ b/ui/plugins/ui/modifiers-dnd.plugin.js
@@ -0,0 +1,100 @@
+(function () {
+    "use strict"
+
+    var styleSheet = document.createElement("style");
+    styleSheet.textContent = `
+        .modifier-card-tiny.drag-sort-active {
+            background: transparent;
+            border: 2px dashed white;
+            opacity:0.2;
+        }
+    `;
+    document.head.appendChild(styleSheet);
+
+    // observe for changes in tag list
+    var observer = new MutationObserver(function (mutations) {
+    //    mutations.forEach(function (mutation) {
+            if (editorModifierTagsList.childNodes.length > 0) {
+                ModifierDragAndDrop(editorModifierTagsList)
+            }
+    //    })
+    })
+    
+    observer.observe(editorModifierTagsList, {
+            childList: true
+    })
+
+    let current
+    function ModifierDragAndDrop(target) {
+        editorModifierTagsList.ondragenter = (e) => {
+            e.preventDefault()
+            e.stopPropagation()
+        }
+        editorModifierTagsList.ondragover = (e) => {
+            e.preventDefault()
+            e.stopPropagation()
+        }
+
+        let overlays = document.querySelector('#editor-inputs-tags-list').querySelectorAll('.modifier-card-overlay')
+        overlays.forEach (i => {
+            i.parentElement.draggable = true;
+            
+            i.parentElement.ondragstart = (e) => {
+                current = i
+                i.parentElement.getElementsByClassName('modifier-card-image-overlay')[0].innerText = ''
+                i.parentElement.draggable = true
+                i.parentElement.classList.add('drag-sort-active')
+                for(let item of document.querySelector('#editor-inputs-tags-list').getElementsByClassName('modifier-card-image-overlay')) {
+                    if (item.parentElement.parentElement.getElementsByClassName('modifier-card-overlay')[0] != current) {
+                        item.parentElement.parentElement.getElementsByClassName('modifier-card-image-overlay')[0].style.opacity = 0
+                        if(item.parentElement.getElementsByClassName('modifier-card-image').length > 0) {
+                            item.parentElement.getElementsByClassName('modifier-card-image')[0].style.filter = 'none'
+                        }
+                        item.parentElement.parentElement.style.transform = 'none'
+                        item.parentElement.parentElement.style.boxShadow = 'none'
+                    }
+                    item.innerText = ''
+                }
+            }
+            
+            i.ondragenter = (e) => {
+                e.preventDefault()
+                if (i != current) {
+                    let currentPos = 0, droppedPos = 0;
+                    for (let it = 0; it < overlays.length; it++) {
+                        if (current == overlays[it]) { currentPos = it; }
+                        if (i == overlays[it]) { droppedPos = it; }
+                    }
+
+                    if (i.parentElement != current.parentElement) {
+                        let currentPos = 0, droppedPos = 0
+                        for (let it = 0; it < overlays.length; it++) {
+                            if (current == overlays[it]) { currentPos = it }
+                            if (i == overlays[it]) { droppedPos = it }
+                        }
+                        if (currentPos < droppedPos) {
+                            current = i.parentElement.parentNode.insertBefore(current.parentElement, i.parentElement.nextSibling).getElementsByClassName('modifier-card-overlay')[0]
+                        } else {
+                            current = i.parentElement.parentNode.insertBefore(current.parentElement, i.parentElement).getElementsByClassName('modifier-card-overlay')[0]
+                        }
+                        // update active tags
+                        const tag = activeTags.splice(currentPos, 1)
+                        activeTags.splice(droppedPos, 0, tag[0])
+                    }
+                }
+            };
+
+            i.ondragover = (e) => {
+                e.preventDefault()
+            }
+            
+            i.parentElement.ondragend = (e) => {
+                i.parentElement.classList.remove('drag-sort-active')
+                for(let item of document.querySelector('#editor-inputs-tags-list').getElementsByClassName('modifier-card-image-overlay')) {
+                    item.style.opacity = ''
+                    item.innerText = '-'
+                }
+            }
+        })
+    }
+})()

From af4a925b54f8fe11a81e9df1fe36ba6fcd900e0a Mon Sep 17 00:00:00 2001
From: patriceac <48073125+patriceac@users.noreply.github.com>
Date: Wed, 16 Nov 2022 00:38:17 -0800
Subject: [PATCH 04/20] Delete modifiers-dnd.plugin.js

---
 ui/plugins/ui/modifiers-dnd.plugin.js | 100 --------------------------
 1 file changed, 100 deletions(-)
 delete mode 100644 ui/plugins/ui/modifiers-dnd.plugin.js

diff --git a/ui/plugins/ui/modifiers-dnd.plugin.js b/ui/plugins/ui/modifiers-dnd.plugin.js
deleted file mode 100644
index 9406cf82..00000000
--- a/ui/plugins/ui/modifiers-dnd.plugin.js
+++ /dev/null
@@ -1,100 +0,0 @@
-(function () {
-    "use strict"
-
-    var styleSheet = document.createElement("style");
-    styleSheet.textContent = `
-        .modifier-card-tiny.drag-sort-active {
-            background: transparent;
-            border: 2px dashed white;
-            opacity:0.2;
-        }
-    `;
-    document.head.appendChild(styleSheet);
-
-    // observe for changes in tag list
-    var observer = new MutationObserver(function (mutations) {
-    //    mutations.forEach(function (mutation) {
-            if (editorModifierTagsList.childNodes.length > 0) {
-                ModifierDragAndDrop(editorModifierTagsList)
-            }
-    //    })
-    })
-    
-    observer.observe(editorModifierTagsList, {
-            childList: true
-    })
-
-    let current
-    function ModifierDragAndDrop(target) {
-        editorModifierTagsList.ondragenter = (e) => {
-            e.preventDefault()
-            e.stopPropagation()
-        }
-        editorModifierTagsList.ondragover = (e) => {
-            e.preventDefault()
-            e.stopPropagation()
-        }
-
-        let overlays = document.querySelector('#editor-inputs-tags-list').querySelectorAll('.modifier-card-overlay')
-        overlays.forEach (i => {
-            i.parentElement.draggable = true;
-            
-            i.parentElement.ondragstart = (e) => {
-                current = i
-                i.parentElement.getElementsByClassName('modifier-card-image-overlay')[0].innerText = ''
-                i.parentElement.draggable = true
-                i.parentElement.classList.add('drag-sort-active')
-                for(let item of document.querySelector('#editor-inputs-tags-list').getElementsByClassName('modifier-card-image-overlay')) {
-                    if (item.parentElement.parentElement.getElementsByClassName('modifier-card-overlay')[0] != current) {
-                        item.parentElement.parentElement.getElementsByClassName('modifier-card-image-overlay')[0].style.opacity = 0
-                        if(item.parentElement.getElementsByClassName('modifier-card-image').length > 0) {
-                            item.parentElement.getElementsByClassName('modifier-card-image')[0].style.filter = 'none'
-                        }
-                        item.parentElement.parentElement.style.transform = 'none'
-                        item.parentElement.parentElement.style.boxShadow = 'none'
-                    }
-                    item.innerText = ''
-                }
-            }
-            
-            i.ondragenter = (e) => {
-                e.preventDefault()
-                if (i != current) {
-                    let currentPos = 0, droppedPos = 0;
-                    for (let it = 0; it < overlays.length; it++) {
-                        if (current == overlays[it]) { currentPos = it; }
-                        if (i == overlays[it]) { droppedPos = it; }
-                    }
-
-                    if (i.parentElement != current.parentElement) {
-                        let currentPos = 0, droppedPos = 0
-                        for (let it = 0; it < overlays.length; it++) {
-                            if (current == overlays[it]) { currentPos = it }
-                            if (i == overlays[it]) { droppedPos = it }
-                        }
-                        if (currentPos < droppedPos) {
-                            current = i.parentElement.parentNode.insertBefore(current.parentElement, i.parentElement.nextSibling).getElementsByClassName('modifier-card-overlay')[0]
-                        } else {
-                            current = i.parentElement.parentNode.insertBefore(current.parentElement, i.parentElement).getElementsByClassName('modifier-card-overlay')[0]
-                        }
-                        // update active tags
-                        const tag = activeTags.splice(currentPos, 1)
-                        activeTags.splice(droppedPos, 0, tag[0])
-                    }
-                }
-            };
-
-            i.ondragover = (e) => {
-                e.preventDefault()
-            }
-            
-            i.parentElement.ondragend = (e) => {
-                i.parentElement.classList.remove('drag-sort-active')
-                for(let item of document.querySelector('#editor-inputs-tags-list').getElementsByClassName('modifier-card-image-overlay')) {
-                    item.style.opacity = ''
-                    item.innerText = '-'
-                }
-            }
-        })
-    }
-})()

From 061cee207f2cb32ee3380e43e825300e305ea4a5 Mon Sep 17 00:00:00 2001
From: patriceac <48073125+patriceac@users.noreply.github.com>
Date: Wed, 16 Nov 2022 00:39:41 -0800
Subject: [PATCH 05/20] Delete modifiers-dnd.plugin.js

---
 ui/plugins/ui/modifiers-dnd.plugin.js | 100 --------------------------
 1 file changed, 100 deletions(-)
 delete mode 100644 ui/plugins/ui/modifiers-dnd.plugin.js

diff --git a/ui/plugins/ui/modifiers-dnd.plugin.js b/ui/plugins/ui/modifiers-dnd.plugin.js
deleted file mode 100644
index 9406cf82..00000000
--- a/ui/plugins/ui/modifiers-dnd.plugin.js
+++ /dev/null
@@ -1,100 +0,0 @@
-(function () {
-    "use strict"
-
-    var styleSheet = document.createElement("style");
-    styleSheet.textContent = `
-        .modifier-card-tiny.drag-sort-active {
-            background: transparent;
-            border: 2px dashed white;
-            opacity:0.2;
-        }
-    `;
-    document.head.appendChild(styleSheet);
-
-    // observe for changes in tag list
-    var observer = new MutationObserver(function (mutations) {
-    //    mutations.forEach(function (mutation) {
-            if (editorModifierTagsList.childNodes.length > 0) {
-                ModifierDragAndDrop(editorModifierTagsList)
-            }
-    //    })
-    })
-    
-    observer.observe(editorModifierTagsList, {
-            childList: true
-    })
-
-    let current
-    function ModifierDragAndDrop(target) {
-        editorModifierTagsList.ondragenter = (e) => {
-            e.preventDefault()
-            e.stopPropagation()
-        }
-        editorModifierTagsList.ondragover = (e) => {
-            e.preventDefault()
-            e.stopPropagation()
-        }
-
-        let overlays = document.querySelector('#editor-inputs-tags-list').querySelectorAll('.modifier-card-overlay')
-        overlays.forEach (i => {
-            i.parentElement.draggable = true;
-            
-            i.parentElement.ondragstart = (e) => {
-                current = i
-                i.parentElement.getElementsByClassName('modifier-card-image-overlay')[0].innerText = ''
-                i.parentElement.draggable = true
-                i.parentElement.classList.add('drag-sort-active')
-                for(let item of document.querySelector('#editor-inputs-tags-list').getElementsByClassName('modifier-card-image-overlay')) {
-                    if (item.parentElement.parentElement.getElementsByClassName('modifier-card-overlay')[0] != current) {
-                        item.parentElement.parentElement.getElementsByClassName('modifier-card-image-overlay')[0].style.opacity = 0
-                        if(item.parentElement.getElementsByClassName('modifier-card-image').length > 0) {
-                            item.parentElement.getElementsByClassName('modifier-card-image')[0].style.filter = 'none'
-                        }
-                        item.parentElement.parentElement.style.transform = 'none'
-                        item.parentElement.parentElement.style.boxShadow = 'none'
-                    }
-                    item.innerText = ''
-                }
-            }
-            
-            i.ondragenter = (e) => {
-                e.preventDefault()
-                if (i != current) {
-                    let currentPos = 0, droppedPos = 0;
-                    for (let it = 0; it < overlays.length; it++) {
-                        if (current == overlays[it]) { currentPos = it; }
-                        if (i == overlays[it]) { droppedPos = it; }
-                    }
-
-                    if (i.parentElement != current.parentElement) {
-                        let currentPos = 0, droppedPos = 0
-                        for (let it = 0; it < overlays.length; it++) {
-                            if (current == overlays[it]) { currentPos = it }
-                            if (i == overlays[it]) { droppedPos = it }
-                        }
-                        if (currentPos < droppedPos) {
-                            current = i.parentElement.parentNode.insertBefore(current.parentElement, i.parentElement.nextSibling).getElementsByClassName('modifier-card-overlay')[0]
-                        } else {
-                            current = i.parentElement.parentNode.insertBefore(current.parentElement, i.parentElement).getElementsByClassName('modifier-card-overlay')[0]
-                        }
-                        // update active tags
-                        const tag = activeTags.splice(currentPos, 1)
-                        activeTags.splice(droppedPos, 0, tag[0])
-                    }
-                }
-            };
-
-            i.ondragover = (e) => {
-                e.preventDefault()
-            }
-            
-            i.parentElement.ondragend = (e) => {
-                i.parentElement.classList.remove('drag-sort-active')
-                for(let item of document.querySelector('#editor-inputs-tags-list').getElementsByClassName('modifier-card-image-overlay')) {
-                    item.style.opacity = ''
-                    item.innerText = '-'
-                }
-            }
-        })
-    }
-})()

From 0c93c4754d5220ed9a547484bdb904db3531210e Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Thu, 17 Nov 2022 10:49:22 +0530
Subject: [PATCH 06/20] Tabs to spaces

---
 ui/media/js/dnd.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/media/js/dnd.js b/ui/media/js/dnd.js
index 1a1c115d..f9914264 100644
--- a/ui/media/js/dnd.js
+++ b/ui/media/js/dnd.js
@@ -430,10 +430,10 @@ function checkWriteToClipboardPermission (result) {
         copyIcon.innerHTML = `<span class="simple-tooltip right">Copy Image Settings</span>`
         copyIcon.addEventListener('click', (event) => {
             event.stopPropagation()
-	    // Add css class 'active'
-	    copyIcon.classList.add('active')
-	    // In 1000 ms remove the 'active' class
-	    asyncDelay(1000).then(() => copyIcon.classList.remove('active'))
+            // Add css class 'active'
+            copyIcon.classList.add('active')
+            // In 1000 ms remove the 'active' class
+            asyncDelay(1000).then(() => copyIcon.classList.remove('active'))
             const uiState = readUI()
             TASK_REQ_NO_EXPORT.forEach((key) => delete uiState.reqBody[key])
             if (uiState.reqBody.init_image && !IMAGE_REGEX.test(uiState.reqBody.init_image)) {
@@ -450,10 +450,10 @@ function checkWriteToClipboardPermission (result) {
         pasteIcon.innerHTML = `<span class="simple-tooltip right">Paste Image Settings</span>`
         pasteIcon.addEventListener('click', (event) => {
             event.stopPropagation()
-	    // Add css class 'active'
-	    pasteIcon.classList.add('active')
-	    // In 1000 ms remove the 'active' class
-	    asyncDelay(1000).then(() => pasteIcon.classList.remove('active'))
+            // Add css class 'active'
+            pasteIcon.classList.add('active')
+            // In 1000 ms remove the 'active' class
+            asyncDelay(1000).then(() => pasteIcon.classList.remove('active'))
             pasteFromClipboard()
         })
         resetSettings.parentNode.insertBefore(pasteIcon, resetSettings)

From cc3186a683c1c347891d8f116d5f98af9aa29dcf Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Thu, 17 Nov 2022 11:01:10 +0530
Subject: [PATCH 07/20] Highlight the Save settings button when pressed

---
 ui/index.html             | 8 ++++----
 ui/media/css/main.css     | 3 +++
 ui/media/js/dnd.js        | 8 ++++----
 ui/media/js/parameters.js | 3 +++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 81ab64be..9b04c9d0 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -7,7 +7,7 @@
     <link rel="icon" type="image/png" href="/media/images/favicon-32x32.png" sizes="32x32">
     <link rel="stylesheet" href="/media/css/fonts.css?v=1">
     <link rel="stylesheet" href="/media/css/themes.css?v=3">
-    <link rel="stylesheet" href="/media/css/main.css?v=17">
+    <link rel="stylesheet" href="/media/css/main.css?v=18">
     <link rel="stylesheet" href="/media/css/auto-save.css?v=5">
     <link rel="stylesheet" href="/media/css/modifier-thumbnails.css?v=4">
     <link rel="stylesheet" href="/media/css/fontawesome-all.min.css?v=1">
@@ -328,15 +328,15 @@
 </div>
 </body>
 
-<script src="media/js/parameters.js?v=9"></script>
-<script src="media/js/plugins.js?v=1"></script>
 <script src="media/js/utils.js?v=6"></script>
+<script src="media/js/parameters.js?v=10"></script>
+<script src="media/js/plugins.js?v=1"></script>
 <script src="media/js/inpainting-editor.js?v=1"></script>
 <script src="media/js/image-modifiers.js?v=6"></script>
 <script src="media/js/auto-save.js?v=8"></script>
 <script src="media/js/main.js?v=23"></script>
 <script src="media/js/themes.js?v=4"></script>
-<script src="media/js/dnd.js?v=9"></script>
+<script src="media/js/dnd.js?v=10"></script>
 <script>
 async function init() {
     await initSettings()
diff --git a/ui/media/css/main.css b/ui/media/css/main.css
index 4b09da6b..8b4feabb 100644
--- a/ui/media/css/main.css
+++ b/ui/media/css/main.css
@@ -898,6 +898,9 @@ input::file-selector-button {
 i.active {
     background: var(--accent-color);
 }
+.primaryButton.active {
+    background: hsl(var(--accent-hue), 100%, 50%);
+}
 #system-info {
     max-width: 800px;
     font-size: 10pt;
diff --git a/ui/media/js/dnd.js b/ui/media/js/dnd.js
index f9914264..a9a93b02 100644
--- a/ui/media/js/dnd.js
+++ b/ui/media/js/dnd.js
@@ -432,8 +432,8 @@ function checkWriteToClipboardPermission (result) {
             event.stopPropagation()
             // Add css class 'active'
             copyIcon.classList.add('active')
-            // In 1000 ms remove the 'active' class
-            asyncDelay(1000).then(() => copyIcon.classList.remove('active'))
+            // In 350 ms remove the 'active' class
+            asyncDelay(350).then(() => copyIcon.classList.remove('active'))
             const uiState = readUI()
             TASK_REQ_NO_EXPORT.forEach((key) => delete uiState.reqBody[key])
             if (uiState.reqBody.init_image && !IMAGE_REGEX.test(uiState.reqBody.init_image)) {
@@ -452,8 +452,8 @@ function checkWriteToClipboardPermission (result) {
             event.stopPropagation()
             // Add css class 'active'
             pasteIcon.classList.add('active')
-            // In 1000 ms remove the 'active' class
-            asyncDelay(1000).then(() => pasteIcon.classList.remove('active'))
+            // In 350 ms remove the 'active' class
+            asyncDelay(350).then(() => pasteIcon.classList.remove('active'))
             pasteFromClipboard()
         })
         resetSettings.parentNode.insertBefore(pasteIcon, resetSettings)
diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js
index 77156dde..1aa87bf8 100644
--- a/ui/media/js/parameters.js
+++ b/ui/media/js/parameters.js
@@ -327,4 +327,7 @@ saveSettingsBtn.addEventListener('click', function() {
 		'update_branch': updateBranch,
 		'ui_open_browser_on_start': uiOpenBrowserOnStartField.checked
     })
+
+	saveSettingsBtn.classList.add('active')
+	asyncDelay(300).then(() => saveSettingsBtn.classList.remove('active'))
 })

From 97ee085f308dab41a05938f21f92bcddc63bf345 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Thu, 17 Nov 2022 12:27:06 +0530
Subject: [PATCH 08/20] Fix a bug where Face Correction (GFPGAN) would fail on
 cuda:N (i.e. GPUs other than cuda:0), as well as fail on CPU if the system
 had an incompatible GPU.

---
 CHANGES.md                     | 13 ++++++-------
 ui/index.html                  |  2 +-
 ui/sd_internal/runtime.py      | 18 ++++++++++--------
 ui/sd_internal/task_manager.py |  4 ----
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c9553b22..eaf13e42 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,8 @@
 # What's new?
 
-### 2.4.6
-* 16 Nov 2022 - Fix a regression in VRAM usage during startup, which caused 'Out of Memory' errors when starting on GPUs with 4gb (or less) VRAM
-
-### 2.4.5
-* 16 Nov 2022 - Add checkbox for "Open browser on startup".
-* 16 Nov 2022 - Add a directory for core plugins that ship with Stable Diffusion UI by default.
-* 16 Nov 2022 - Add a "What's New?" tab as a core plugin, which fetches the contents of CHANGES.md from the app's release branch.
+### 2.4
+* 2.4.7 - 17 Nov 2022 - Fix a bug where Face Correction (GFPGAN) would fail on cuda:N (i.e. GPUs other than cuda:0), as well as fail on CPU if the system had an incompatible GPU.
+* 2.4.6 - 16 Nov 2022 - Fix a regression in VRAM usage during startup, which caused 'Out of Memory' errors when starting on GPUs with 4gb (or less) VRAM
+* 2.4.5 - 16 Nov 2022 - Add checkbox for "Open browser on startup".
+* 2.4.5 - 16 Nov 2022 - Add a directory for core plugins that ship with Stable Diffusion UI by default.
+* 2.4.5 - 16 Nov 2022 - Add a "What's New?" tab as a core plugin, which fetches the contents of CHANGES.md from the app's release branch.
diff --git a/ui/index.html b/ui/index.html
index 9b04c9d0..5ffea432 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -20,7 +20,7 @@
 <div id="container">
     <div id="top-nav">
         <div id="logo">
-            <h1>Stable Diffusion UI <small>v2.4.6 <span id="updateBranchLabel"></span></small></h1>
+            <h1>Stable Diffusion UI <small>v2.4.7 <span id="updateBranchLabel"></span></small></h1>
         </div>
         <div id="server-status">
             <div id="server-status-color">●</div>
diff --git a/ui/sd_internal/runtime.py b/ui/sd_internal/runtime.py
index e2346730..2308298e 100644
--- a/ui/sd_internal/runtime.py
+++ b/ui/sd_internal/runtime.py
@@ -236,9 +236,14 @@ def wait_model_move_to(model, target_device): # Send to target_device and wait u
 
 def load_model_gfpgan():
     if thread_data.gfpgan_file is None: raise ValueError(f'Thread gfpgan_file is undefined.')
+
+    # hack for a bug in facexlib: https://github.com/xinntao/facexlib/pull/19/files
+    from facexlib.detection import retinaface
+    retinaface.device = torch.device(thread_data.device)
+    print('forced retinaface.device to', thread_data.device)
+
     model_path = thread_data.gfpgan_file + ".pth"
-    device = 'cuda:0' if force_gfpgan_to_cuda0 else thread_data.device
-    thread_data.model_gfpgan = GFPGANer(device=torch.device(device), model_path=model_path, upscale=1, arch='clean', channel_multiplier=2, bg_upsampler=None)
+    thread_data.model_gfpgan = GFPGANer(device=torch.device(thread_data.device), model_path=model_path, upscale=1, arch='clean', channel_multiplier=2, bg_upsampler=None)
     print('loaded', thread_data.gfpgan_file, 'to', thread_data.model_gfpgan.device, 'precision', thread_data.precision)
 
 def load_model_real_esrgan():
@@ -288,10 +293,10 @@ def apply_filters(filter_name, image_data, model_path=None):
     print(f'Applying filter {filter_name}...')
     gc() # Free space before loading new data.
 
-    if filter_name == 'gfpgan':
-        if isinstance(image_data, torch.Tensor):
-            image_data.to('cuda:0' if force_gfpgan_to_cuda0 else thread_data.device)
+    if isinstance(image_data, torch.Tensor):
+        image_data.to(thread_data.device)
 
+    if filter_name == 'gfpgan':
         if model_path is not None and model_path != thread_data.gfpgan_file:
             thread_data.gfpgan_file = model_path
             load_model_gfpgan()
@@ -303,9 +308,6 @@ def apply_filters(filter_name, image_data, model_path=None):
         image_data = output[:,:,::-1]
 
     if filter_name == 'real_esrgan':
-        if isinstance(image_data, torch.Tensor):
-            image_data.to(thread_data.device)
-
         if model_path is not None and model_path != thread_data.real_esrgan_file:
             thread_data.real_esrgan_file = model_path
             load_model_real_esrgan()
diff --git a/ui/sd_internal/task_manager.py b/ui/sd_internal/task_manager.py
index d10afdd8..45f90f9f 100644
--- a/ui/sd_internal/task_manager.py
+++ b/ui/sd_internal/task_manager.py
@@ -217,10 +217,6 @@ def thread_get_next_task():
     task = None
     try:  # Select a render task.
         for queued_task in tasks_queue:
-            if queued_task.request.use_face_correction and runtime.thread_data.device == 'cpu' and is_alive() == 1:
-                queued_task.error = Exception('The CPU cannot be used to run this task currently. Please remove "Fix incorrect faces" from Image Settings and try again.')
-                task = queued_task
-                break
             if queued_task.render_device and runtime.thread_data.device != queued_task.render_device:
                 # Is asking for a specific render device.
                 if is_alive(queued_task.render_device) > 0:

From 7bda3e6994ab5e69a5b6196c0494988f9d5d0ce4 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Thu, 17 Nov 2022 13:06:36 +0530
Subject: [PATCH 09/20] Release summary and detailed changelog

---
 CHANGES.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index eaf13e42..2899cafa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,24 @@
 # What's new?
 
-### 2.4
+## 2.4
+### Major Changes
+- **Support for custom VAE models**. You can place your VAE files in the `models/vae` folder, and refresh the browser page to use them. More info: https://github.com/cmdr2/stable-diffusion-ui/wiki/VAE-Variational-Auto-Encoder
+- **Experimental support for multiple GPUs!** It should work automatically. Just open one browser tab per GPU, and spread your tasks across your GPUs. For e.g. open our UI in two browser tabs if you have two GPUs. You can customize which GPUs it should use in the "Settings" tab, otherwise let it automatically pick the best GPUs. Thanks @madrang
+- **Cleaner UI design** - Show settings and help in new tabs, instead of dropdown popups (which were buggy). Thanks @mdiller
+- **Progress bar.** Thanks @mdiller
+- **Custom Image Modifiers** - You can now save your custom image modifiers! Your saved modifiers can include special characters like `{}, (), [], |`
+- Drag and Drop **text files generated from previously saved images**, and copy settings to clipboard. Thanks @madrang
+- Paste settings from clipboard. Thanks @JeLuf
+- Bug fixes to reduce the chances of tasks crashing during long multi-hour runs (chrome can put long-running background tabs to sleep). Thanks @JeLuf and @madrang
+- **Improved documentation.** Thanks @JeLuf and @jsuelwald
+- Improved the codebase for dealing with system settings and UI settings. Thanks @mdiller
+- Help instructions next to some setttings, and in the tab
+- Show system info in the settings tab
+- Keyboard shortcut: Ctrl+Enter to start a task
+- Configuration to prevent the browser from opening on startup
+- Lots of minor bug fixes
+
+### Detailed changelog
 * 2.4.7 - 17 Nov 2022 - Fix a bug where Face Correction (GFPGAN) would fail on cuda:N (i.e. GPUs other than cuda:0), as well as fail on CPU if the system had an incompatible GPU.
 * 2.4.6 - 16 Nov 2022 - Fix a regression in VRAM usage during startup, which caused 'Out of Memory' errors when starting on GPUs with 4gb (or less) VRAM
 * 2.4.5 - 16 Nov 2022 - Add checkbox for "Open browser on startup".

From 7e94ec986efedf795251dd90099a645aed876a14 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Thu, 17 Nov 2022 13:07:35 +0530
Subject: [PATCH 10/20] Update CHANGES.md

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2899cafa..d6a07b5b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,6 @@
 # What's new?
 
-## 2.4
+## v2.4
 ### Major Changes
 - **Support for custom VAE models**. You can place your VAE files in the `models/vae` folder, and refresh the browser page to use them. More info: https://github.com/cmdr2/stable-diffusion-ui/wiki/VAE-Variational-Auto-Encoder
 - **Experimental support for multiple GPUs!** It should work automatically. Just open one browser tab per GPU, and spread your tasks across your GPUs. For e.g. open our UI in two browser tabs if you have two GPUs. You can customize which GPUs it should use in the "Settings" tab, otherwise let it automatically pick the best GPUs. Thanks @madrang

From f2367932e11f5a5645e5b143a114945e13ea36d9 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Thu, 17 Nov 2022 13:13:01 +0530
Subject: [PATCH 11/20] Style code tags in the What's New markdown

---
 ui/index.html         | 2 +-
 ui/media/css/main.css | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/index.html b/ui/index.html
index 5ffea432..a00fb012 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -7,7 +7,7 @@
     <link rel="icon" type="image/png" href="/media/images/favicon-32x32.png" sizes="32x32">
     <link rel="stylesheet" href="/media/css/fonts.css?v=1">
     <link rel="stylesheet" href="/media/css/themes.css?v=3">
-    <link rel="stylesheet" href="/media/css/main.css?v=18">
+    <link rel="stylesheet" href="/media/css/main.css?v=19">
     <link rel="stylesheet" href="/media/css/auto-save.css?v=5">
     <link rel="stylesheet" href="/media/css/modifier-thumbnails.css?v=4">
     <link rel="stylesheet" href="/media/css/fontawesome-all.min.css?v=1">
diff --git a/ui/media/css/main.css b/ui/media/css/main.css
index 8b4feabb..06e1ed4f 100644
--- a/ui/media/css/main.css
+++ b/ui/media/css/main.css
@@ -22,6 +22,11 @@ a:visited {
 label {
     font-size: 10pt;
 }
+code {
+    background: var(--background-color4);
+    padding: 2px 4px;
+    border-radius: 4px;
+}
 #prompt {
     width: 100%;
     height: 65pt;

From c99b2edf982d3a534f2f1ab7a1b9dd928ccc564e Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Thu, 17 Nov 2022 13:17:20 +0530
Subject: [PATCH 12/20] Update CHANGES.md

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index d6a07b5b..cb7eb4dc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@
 - Keyboard shortcut: Ctrl+Enter to start a task
 - Configuration to prevent the browser from opening on startup
 - Lots of minor bug fixes
+- A `What's New?` tab in the UI
 
 ### Detailed changelog
 * 2.4.7 - 17 Nov 2022 - Fix a bug where Face Correction (GFPGAN) would fail on cuda:N (i.e. GPUs other than cuda:0), as well as fail on CPU if the system had an incompatible GPU.

From 6c089c0a78edb20258a25d92ec4776e8c5d48c14 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Thu, 17 Nov 2022 13:39:29 +0530
Subject: [PATCH 13/20] Link to Multi GPU wiki page

---
 CHANGES.md    | 2 +-
 ui/index.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d6a07b5b..bd528dd1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,7 +3,7 @@
 ## v2.4
 ### Major Changes
 - **Support for custom VAE models**. You can place your VAE files in the `models/vae` folder, and refresh the browser page to use them. More info: https://github.com/cmdr2/stable-diffusion-ui/wiki/VAE-Variational-Auto-Encoder
-- **Experimental support for multiple GPUs!** It should work automatically. Just open one browser tab per GPU, and spread your tasks across your GPUs. For e.g. open our UI in two browser tabs if you have two GPUs. You can customize which GPUs it should use in the "Settings" tab, otherwise let it automatically pick the best GPUs. Thanks @madrang
+- **Experimental support for multiple GPUs!** It should work automatically. Just open one browser tab per GPU, and spread your tasks across your GPUs. For e.g. open our UI in two browser tabs if you have two GPUs. You can customize which GPUs it should use in the "Settings" tab, otherwise let it automatically pick the best GPUs. Thanks @madrang . More info: https://github.com/cmdr2/stable-diffusion-ui/wiki/Run-on-Multiple-GPUs
 - **Cleaner UI design** - Show settings and help in new tabs, instead of dropdown popups (which were buggy). Thanks @mdiller
 - **Progress bar.** Thanks @mdiller
 - **Custom Image Modifiers** - You can now save your custom image modifiers! Your saved modifiers can include special characters like `{}, (), [], |`
diff --git a/ui/index.html b/ui/index.html
index a00fb012..43a327ad 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -264,6 +264,7 @@
                                 <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/UI-Overview" target="_blank"><i class="fa-solid fa-list fa-fw"></i> UI Overview</a>
                                 <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Writing-Prompts" target="_blank"><i class="fa-solid fa-pen-to-square fa-fw"></i> Writing prompts</a>
                                 <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Inpainting" target="_blank"><i class="fa-solid fa-paintbrush fa-fw"></i> Inpainting</a>
+                                <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Run-on-Multiple-GPUs" target="_blank"><i class="fa-solid fa-paintbrush fa-fw"></i> Run on Multiple GPUs</a>
                             </ul>
   
                             <li><span class="help-section">Installation</span>

From 025d4df774c805fdab652d7775dc22fbf5845f5c Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Fri, 18 Nov 2022 13:10:56 +0530
Subject: [PATCH 14/20] Don't crash if a VAE file fails to load

---
 CHANGES.md                     |  1 +
 ui/sd_internal/runtime.py      | 27 ++++++++++++++++++---------
 ui/sd_internal/task_manager.py |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ac31a612..2151b8e8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@
 - A `What's New?` tab in the UI
 
 ### Detailed changelog
+* 2.4.7 - 18 Nov 2022 - Don't crash if a VAE file fails to load
 * 2.4.7 - 17 Nov 2022 - Fix a bug where Face Correction (GFPGAN) would fail on cuda:N (i.e. GPUs other than cuda:0), as well as fail on CPU if the system had an incompatible GPU.
 * 2.4.6 - 16 Nov 2022 - Fix a regression in VRAM usage during startup, which caused 'Out of Memory' errors when starting on GPUs with 4gb (or less) VRAM
 * 2.4.5 - 16 Nov 2022 - Add checkbox for "Open browser on startup".
diff --git a/ui/sd_internal/runtime.py b/ui/sd_internal/runtime.py
index 2308298e..486d2179 100644
--- a/ui/sd_internal/runtime.py
+++ b/ui/sd_internal/runtime.py
@@ -140,15 +140,24 @@ def load_model_ckpt():
     _, _ = modelFS.load_state_dict(sd, strict=False)
 
     if thread_data.vae_file is not None:
-        for model_extension in ['.ckpt', '.vae.pt']:
-            if os.path.exists(thread_data.vae_file + model_extension):
-                print(f"Loading VAE weights from: {thread_data.vae_file}{model_extension}")
-                vae_ckpt = torch.load(thread_data.vae_file + model_extension, map_location="cpu")
-                vae_dict = {k: v for k, v in vae_ckpt["state_dict"].items() if k[0:4] != "loss"}
-                modelFS.first_stage_model.load_state_dict(vae_dict, strict=False)
-                break
-            else:
-                print(f'Cannot find VAE file: {thread_data.vae_file}{model_extension}')
+        try:
+            loaded = False
+            for model_extension in ['.ckpt', '.vae.pt']:
+                if os.path.exists(thread_data.vae_file + model_extension):
+                    print(f"Loading VAE weights from: {thread_data.vae_file}{model_extension}")
+                    vae_ckpt = torch.load(thread_data.vae_file + model_extension, map_location="cpu")
+                    vae_dict = {k: v for k, v in vae_ckpt["state_dict"].items() if k[0:4] != "loss"}
+                    modelFS.first_stage_model.load_state_dict(vae_dict, strict=False)
+                    loaded = True
+                    break
+
+            if not loaded:
+                print(f'Cannot find VAE: {thread_data.vae_file}')
+                thread_data.vae_file = None
+        except:
+            print(traceback.format_exc())
+            print(f'Could not load VAE: {thread_data.vae_file}')
+            thread_data.vae_file = None
 
     modelFS.eval()
     # if thread_data.device != 'cpu':
diff --git a/ui/sd_internal/task_manager.py b/ui/sd_internal/task_manager.py
index 45f90f9f..4b96438c 100644
--- a/ui/sd_internal/task_manager.py
+++ b/ui/sd_internal/task_manager.py
@@ -436,7 +436,7 @@ def stop_render_thread(device):
     try:
         device_manager.validate_device_id(device, log_prefix='stop_render_thread')
     except:
-        print(traceback.format_exec())
+        print(traceback.format_exc())
         return False
 
     if not manager_lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): raise Exception('stop_render_thread' + ERR_LOCK_FAILED)

From f7ed65d7490241fd49e1b132d18c7e052a786624 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Fri, 18 Nov 2022 14:51:05 +0530
Subject: [PATCH 15/20] Bump version

---
 ui/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 43a327ad..7290a756 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -7,7 +7,7 @@
     <link rel="icon" type="image/png" href="/media/images/favicon-32x32.png" sizes="32x32">
     <link rel="stylesheet" href="/media/css/fonts.css?v=1">
     <link rel="stylesheet" href="/media/css/themes.css?v=3">
-    <link rel="stylesheet" href="/media/css/main.css?v=19">
+    <link rel="stylesheet" href="/media/css/main.css?v=20">
     <link rel="stylesheet" href="/media/css/auto-save.css?v=5">
     <link rel="stylesheet" href="/media/css/modifier-thumbnails.css?v=4">
     <link rel="stylesheet" href="/media/css/fontawesome-all.min.css?v=1">
@@ -333,9 +333,9 @@
 <script src="media/js/parameters.js?v=10"></script>
 <script src="media/js/plugins.js?v=1"></script>
 <script src="media/js/inpainting-editor.js?v=1"></script>
-<script src="media/js/image-modifiers.js?v=6"></script>
+<script src="media/js/image-modifiers.js?v=7"></script>
 <script src="media/js/auto-save.js?v=8"></script>
-<script src="media/js/main.js?v=23"></script>
+<script src="media/js/main.js?v=24"></script>
 <script src="media/js/themes.js?v=4"></script>
 <script src="media/js/dnd.js?v=10"></script>
 <script>

From f67758eaf36edeaa684e94187e1b8e9dd91b9407 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Fri, 18 Nov 2022 14:58:21 +0530
Subject: [PATCH 16/20] Bring back some styling that was removed accidentally
 by the PR merge

---
 ui/index.html         | 2 +-
 ui/media/css/main.css | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 7290a756..f06dd8a1 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -7,7 +7,7 @@
     <link rel="icon" type="image/png" href="/media/images/favicon-32x32.png" sizes="32x32">
     <link rel="stylesheet" href="/media/css/fonts.css?v=1">
     <link rel="stylesheet" href="/media/css/themes.css?v=3">
-    <link rel="stylesheet" href="/media/css/main.css?v=20">
+    <link rel="stylesheet" href="/media/css/main.css?v=21">
     <link rel="stylesheet" href="/media/css/auto-save.css?v=5">
     <link rel="stylesheet" href="/media/css/modifier-thumbnails.css?v=4">
     <link rel="stylesheet" href="/media/css/fontawesome-all.min.css?v=1">
diff --git a/ui/media/css/main.css b/ui/media/css/main.css
index 0d8ca9e9..ff224cf4 100644
--- a/ui/media/css/main.css
+++ b/ui/media/css/main.css
@@ -33,6 +33,7 @@ code {
     font-size: 13px;
     margin-bottom: 6px;
     margin-top: 5px;
+    display: block;
 }
 .image_preview_container {
     margin-top: 10pt;
@@ -669,9 +670,9 @@ input::file-selector-button {
 }
 
 @media (min-width: 700px) {
-    #editor {
+    /* #editor {
         max-width: 480px;
-    }
+    }*/
     .float-container {
         padding: 20px;
     }

From ec294227bd18178634e45e11e03d298f283423cc Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Fri, 18 Nov 2022 15:14:35 +0530
Subject: [PATCH 17/20] Bump version

---
 CHANGES.md    | 1 +
 ui/index.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2151b8e8..46d3e588 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@
 - A `What's New?` tab in the UI
 
 ### Detailed changelog
+* 2.4.8 - 18 Nov 2022 - A `Use Settings` button to use the settings from a previously generated image task
 * 2.4.7 - 18 Nov 2022 - Don't crash if a VAE file fails to load
 * 2.4.7 - 17 Nov 2022 - Fix a bug where Face Correction (GFPGAN) would fail on cuda:N (i.e. GPUs other than cuda:0), as well as fail on CPU if the system had an incompatible GPU.
 * 2.4.6 - 16 Nov 2022 - Fix a regression in VRAM usage during startup, which caused 'Out of Memory' errors when starting on GPUs with 4gb (or less) VRAM
diff --git a/ui/index.html b/ui/index.html
index f06dd8a1..47782070 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -20,7 +20,7 @@
 <div id="container">
     <div id="top-nav">
         <div id="logo">
-            <h1>Stable Diffusion UI <small>v2.4.7 <span id="updateBranchLabel"></span></small></h1>
+            <h1>Stable Diffusion UI <small>v2.4.8 <span id="updateBranchLabel"></span></small></h1>
         </div>
         <div id="server-status">
             <div id="server-status-color">●</div>

From a697bd935abd6035e72d7bfc532e40f3192c5877 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Fri, 18 Nov 2022 15:38:17 +0530
Subject: [PATCH 18/20] Refactor the Use Settings code, and move that to the
 common restoreTask() function

---
 ui/index.html       |  4 ++--
 ui/media/js/dnd.js  | 43 +++++++++++++++++++++++++++++++++++++++++--
 ui/media/js/main.js | 41 +++--------------------------------------
 3 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 47782070..f73c9253 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -335,9 +335,9 @@
 <script src="media/js/inpainting-editor.js?v=1"></script>
 <script src="media/js/image-modifiers.js?v=7"></script>
 <script src="media/js/auto-save.js?v=8"></script>
-<script src="media/js/main.js?v=24"></script>
+<script src="media/js/main.js?v=25"></script>
 <script src="media/js/themes.js?v=4"></script>
-<script src="media/js/dnd.js?v=10"></script>
+<script src="media/js/dnd.js?v=11"></script>
 <script>
 async function init() {
     await initSettings()
diff --git a/ui/media/js/dnd.js b/ui/media/js/dnd.js
index a9a93b02..9cbbe8af 100644
--- a/ui/media/js/dnd.js
+++ b/ui/media/js/dnd.js
@@ -243,7 +243,9 @@ const TASK_MAPPING = {
         parse: (val) => val
     }
 }
-function restoreTaskToUI(task) {
+function restoreTaskToUI(task, fieldsToSkip) {
+    fieldsToSkip = fieldsToSkip || []
+
     if ('numOutputsTotal' in task) {
         numOutputsTotalField.value = task.numOutputsTotal
     }
@@ -255,10 +257,47 @@ function restoreTaskToUI(task) {
         return
     }
     for (const key in TASK_MAPPING) {
-        if (key in task.reqBody) {
+        if (key in task.reqBody && !fieldsToSkip.includes(key)) {
             TASK_MAPPING[key].setUI(task.reqBody[key])
         }
     }
+
+    // restore the original tag
+    promptField.value = task.reqBody.original_prompt || task.reqBody.prompt
+
+    // Restore modifiers
+    if (task.reqBody.active_tags) {
+        refreshModifiersState(task.reqBody.active_tags)
+    }
+
+    // properly reset checkboxes
+    if (!('use_face_correction' in task.reqBody)) {
+        useFaceCorrectionField.checked = false
+    }
+    if (!('use_upscale' in task.reqBody)) {
+        useUpscalingField.checked = false
+    }
+    if (!('mask' in task.reqBody)) {
+        maskSetting.checked = false
+    }
+    upscaleModelField.disabled = !useUpscalingField.checked
+
+    // Show the source picture if present
+    initImagePreview.src = (task.reqBody.init_image == undefined ? '' : task.reqBody.init_image)
+    if (IMAGE_REGEX.test(initImagePreview.src)) {
+        Boolean(task.reqBody.mask) ? inpaintingEditor.setImg(task.reqBody.mask) : inpaintingEditor.resetBackground()
+        initImagePreviewContainer.style.display = 'block'
+        inpaintingEditorContainer.style.display = 'none'
+        promptStrengthContainer.style.display = 'table-row'
+        //samplerSelectionContainer.style.display = 'none'
+        // maskSetting.checked = false
+        inpaintingEditorContainer.style.display = maskSetting.checked ? 'block' : 'none'
+    } else {
+        initImagePreviewContainer.style.display = 'none'
+        // inpaintingEditorContainer.style.display = 'none'
+        promptStrengthContainer.style.display = 'none'
+        // maskSetting.style.display = 'none'
+    }
 }
 function readUI() {
     const reqBody = {}
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 3c717f07..2650d1dd 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -898,44 +898,9 @@ function createTask(task) {
     })
 
     task['useSettings'] = taskEntry.querySelector('.useSettings')
-    task['useSettings'].addEventListener('click', async function(e) {
-        TASK_REQ_NO_EXPORT.forEach((key) => delete task.reqBody[key]) // don't restore system settings when restoring tasks
-        restoreTaskToUI(task)
-        e.stopPropagation();
-
-        // restore the original tag
-        promptField.value = task.reqBody.original_prompt
-
-        // Restore modifiers
-        refreshModifiersState(task.reqBody.active_tags)
-
-        // properly reset checkboxes
-        if (!('use_face_correction' in task.reqBody)) {
-            useFaceCorrectionField.checked = false
-        }
-        if (!('use_upscale' in task.reqBody)) {
-            useUpscalingField.checked = false
-        }
-        if (!('mask' in task.reqBody)) {
-            maskSetting.checked = false
-        }
-
-        // Show the source picture if present
-        initImagePreview.src = (task.reqBody.init_image == undefined ? '' : task.reqBody.init_image)
-        if (IMAGE_REGEX.test(initImagePreview.src)) {
-            Boolean(task.reqBody.mask) ? inpaintingEditor.setImg(task.reqBody.mask) : inpaintingEditor.resetBackground()
-            initImagePreviewContainer.style.display = 'block'
-            inpaintingEditorContainer.style.display = 'none'
-            promptStrengthContainer.style.display = 'table-row'
-            //samplerSelectionContainer.style.display = 'none'
-            // maskSetting.checked = false
-            inpaintingEditorContainer.style.display = maskSetting.checked ? 'block' : 'none'
-        } else {
-            initImagePreviewContainer.style.display = 'none'
-            // inpaintingEditorContainer.style.display = 'none'
-            promptStrengthContainer.style.display = 'none'
-            // maskSetting.style.display = 'none'
-        }
+    task['useSettings'].addEventListener('click', function(e) {
+        e.stopPropagation()
+        restoreTaskToUI(task, TASK_REQ_NO_EXPORT)
     })
 
     imagePreview.insertBefore(taskEntry, previewTools.nextSibling)

From f74c57449e270b9f955e7211c8cc68eb0d8dae67 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Fri, 18 Nov 2022 15:54:47 +0530
Subject: [PATCH 19/20] Cosmetic changes to Use Settings

---
 ui/index.html         | 4 ++--
 ui/media/css/main.css | 3 ++-
 ui/media/js/main.js   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index f73c9253..f7e95a3c 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -7,7 +7,7 @@
     <link rel="icon" type="image/png" href="/media/images/favicon-32x32.png" sizes="32x32">
     <link rel="stylesheet" href="/media/css/fonts.css?v=1">
     <link rel="stylesheet" href="/media/css/themes.css?v=3">
-    <link rel="stylesheet" href="/media/css/main.css?v=21">
+    <link rel="stylesheet" href="/media/css/main.css?v=22">
     <link rel="stylesheet" href="/media/css/auto-save.css?v=5">
     <link rel="stylesheet" href="/media/css/modifier-thumbnails.css?v=4">
     <link rel="stylesheet" href="/media/css/fontawesome-all.min.css?v=1">
@@ -335,7 +335,7 @@
 <script src="media/js/inpainting-editor.js?v=1"></script>
 <script src="media/js/image-modifiers.js?v=7"></script>
 <script src="media/js/auto-save.js?v=8"></script>
-<script src="media/js/main.js?v=25"></script>
+<script src="media/js/main.js?v=26"></script>
 <script src="media/js/themes.js?v=4"></script>
 <script src="media/js/dnd.js?v=11"></script>
 <script>
diff --git a/ui/media/css/main.css b/ui/media/css/main.css
index ff224cf4..6b870283 100644
--- a/ui/media/css/main.css
+++ b/ui/media/css/main.css
@@ -444,8 +444,9 @@ img {
 }
 .useSettings {
     background: var(--accent-color);
-    border: var(--make-image-border);
+    border: 1px solid var(--accent-color);
     color: rgb(255, 221, 255);
+    padding: 3pt 6pt;
     margin-right: 6pt;
     float: right;
 }
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 2650d1dd..5f4498cb 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -858,7 +858,7 @@ function createTask(task) {
     taskEntry.innerHTML = ` <div class="header-content panel collapsible active">
                                 <div class="taskStatusLabel">Enqueued</div>
                                 <button class="secondaryButton stopTask"><i class="fa-solid fa-trash-can"></i> Remove</button>
-                            <button class="secondaryButton useSettings"><i class="fa-solid fa-redo"></i> Use Settings</button>
+                                <button class="secondaryButton useSettings"><i class="fa-solid fa-redo"></i> Use as Input</button>
                                 <div class="preview-prompt collapsible active"></div>
                                 <div class="taskConfig">${taskConfig}</div>
                                 <div class="outputMsg"></div>

From f25d35fad80abf95e446ce41c7c8015923308afc Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Fri, 18 Nov 2022 15:55:53 +0530
Subject: [PATCH 20/20] changelog

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 46d3e588..198d2b64 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,7 +20,7 @@
 - A `What's New?` tab in the UI
 
 ### Detailed changelog
-* 2.4.8 - 18 Nov 2022 - A `Use Settings` button to use the settings from a previously generated image task
+* 2.4.8 - 18 Nov 2022 - A `Use as Input` button to use the settings from a previously generated image task. Thanks @patriceac
 * 2.4.7 - 18 Nov 2022 - Don't crash if a VAE file fails to load
 * 2.4.7 - 17 Nov 2022 - Fix a bug where Face Correction (GFPGAN) would fail on cuda:N (i.e. GPUs other than cuda:0), as well as fail on CPU if the system had an incompatible GPU.
 * 2.4.6 - 16 Nov 2022 - Fix a regression in VRAM usage during startup, which caused 'Out of Memory' errors when starting on GPUs with 4gb (or less) VRAM