From f904945d405fd9ada8db9eab2c426bf37d718a62 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Mon, 14 Nov 2022 13:02:36 +0530
Subject: [PATCH] Disable the GPU list if auto is enabled

---
 ui/index.html             |  4 ++--
 ui/media/js/main.js       | 24 +++++++++++++++++-------
 ui/media/js/parameters.js |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index b938bb48..ccd16626 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -332,13 +332,13 @@
 </div>
 </body>
 
-<script src="media/js/parameters.js?v=5"></script>
+<script src="media/js/parameters.js?v=6"></script>
 <script src="media/js/plugins.js?v=1"></script>
 <script src="media/js/utils.js?v=6"></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=7"></script>
-<script src="media/js/main.js?v=14"></script>
+<script src="media/js/main.js?v=15"></script>
 <script src="media/js/themes.js?v=4"></script>
 <script src="media/js/dnd.js?v=8"></script>
 <script>
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 4bfc4144..67a67746 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -1147,7 +1147,13 @@ useCPUField.addEventListener('click', function() {
     } else if (useGPUsField.options.length >= MIN_GPUS_TO_SHOW_SELECTION) {
         gpuSettingEntry.style.display = ''
         autoPickGPUSettingEntry.style.display = ''
-        autoPickGPUsField.checked = (autoPickGPUsField.getAttribute('data-old-value') === 'true')
+        let oldVal = autoPickGPUsField.getAttribute('data-old-value')
+        if (oldVal === null || oldVal === undefined) { // the UI started with CPU selected by default
+            autoPickGPUsField.checked = true
+        } else {
+            autoPickGPUsField.checked = (oldVal === 'true')
+        }
+        useGPUsField.disabled = autoPickGPUsField.checked
     }
 })
 
@@ -1160,6 +1166,8 @@ autoPickGPUsField.addEventListener('click', function() {
     if (this.checked) {
         $('#use_gpus').val([])
     }
+
+    useGPUsField.disabled = this.checked
 })
 
 async function changeAppConfig(configDelta) {
@@ -1376,16 +1384,16 @@ async function getDevices() {
                 useCPUField.checked = true
             }
 
-            if (allDeviceIds.length < MIN_GPUS_TO_SHOW_SELECTION) {
+            if (allDeviceIds.length < MIN_GPUS_TO_SHOW_SELECTION || useCPUField.checked) {
                 let gpuSettingEntry = getParameterSettingsEntry('use_gpus')
                 gpuSettingEntry.style.display = 'none'
                 let autoPickGPUSettingEntry = getParameterSettingsEntry('auto_pick_gpus')
                 autoPickGPUSettingEntry.style.display = 'none'
+            }
 
-                if (allDeviceIds.length === 0) {
-                    useCPUField.checked = true
-                    useCPUField.disabled = true // no compatible GPUs, so make the CPU mandatory
-                }
+            if (allDeviceIds.length === 0) {
+                useCPUField.checked = true
+                useCPUField.disabled = true // no compatible GPUs, so make the CPU mandatory
             }
 
             autoPickGPUsField.checked = (res['config'] === 'auto')
@@ -1397,7 +1405,9 @@ async function getDevices() {
                 useGPUsField.insertAdjacentHTML('beforeend', deviceOption)
             })
 
-            if (!autoPickGPUsField.checked) {
+            if (autoPickGPUsField.checked) {
+                useGPUsField.disabled = true
+            } else {
                 $('#use_gpus').val(activeDeviceIds)
             }
         }
diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js
index 790108dc..8272cab7 100644
--- a/ui/media/js/parameters.js
+++ b/ui/media/js/parameters.js
@@ -83,7 +83,7 @@ var PARAMETERS = [
 		id: "use_gpus",
 		type: ParameterType.select_multiple,
 		label: "GPUs to use",
-		note: "select multiple GPUs to process in parallel",
+		note: "to process in parallel",
 		default: false,
 	},
 	{