Merge branch 'master' into test_resolve_conflicts

3 files changed, 19 insertions, 2 deletions

diff --git a/javascript/imageviewer.js b/javascript/imageviewer.js
index 65a33dd7..d4ab6984 100644
--- a/javascript/imageviewer.js
+++ b/javascript/imageviewer.js
@@ -31,7 +31,7 @@ function updateOnBackgroundChange() {
             }
         })
 
-        if (modalImage.src != currentButton.children[0].src) {
+        if (currentButton?.children?.length > 0 && modalImage.src != currentButton.children[0].src) {
             modalImage.src = currentButton.children[0].src;
             if (modalImage.style.display === 'none') {
                 modal.style.setProperty('background-image', `url(${modalImage.src})`)
diff --git a/modules/shared.py b/modules/shared.py
index 7946d603..63fb4cec 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -80,6 +80,16 @@ parser.add_argument("--disable-safe-unpickle", action='store_true', help="disabl
 

 

 cmd_opts = parser.parse_args()

+restricted_opts = [

+    "samples_filename_pattern",

+    "outdir_samples",

+    "outdir_txt2img_samples",

+    "outdir_img2img_samples",

+    "outdir_extras_samples",

+    "outdir_grids",

+    "outdir_txt2img_grids",

+    "outdir_save",

+]

 

 devices.device, devices.device_interrogate, devices.device_gfpgan, devices.device_bsrgan, devices.device_esrgan, devices.device_scunet, devices.device_codeformer = \

 (devices.cpu if any(y in cmd_opts.use_cpu for y in [x, 'all']) else devices.get_optimal_device() for x in ['sd', 'interrogate', 'gfpgan', 'bsrgan', 'esrgan', 'scunet', 'codeformer'])

diff --git a/modules/ui.py b/modules/ui.py
index 32536b2d..7c095cb4 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -25,7 +25,8 @@ import gradio.routes
 

 from modules import sd_hijack, sd_models

 from modules.paths import script_path

-from modules.shared import opts, cmd_opts,aesthetic_embeddings

+

+from modules.shared import opts, cmd_opts, restricted_opts, aesthetic_embeddings

 

 if cmd_opts.deepdanbooru:

     from modules.deepbooru import get_deepbooru_tags

@@ -1505,6 +1506,9 @@ Requested path was: {f}
             if comp_args and isinstance(comp_args, dict) and comp_args.get('visible') is False:

                 continue

 

+            if cmd_opts.hide_ui_dir_config and key in restricted_opts:

+                continue

+

             oldval = opts.data.get(key, None)

             opts.data[key] = value

 

@@ -1522,6 +1526,9 @@ Requested path was: {f}
         if not opts.same_type(value, opts.data_labels[key].default):

             return gr.update(visible=True), opts.dumpjson()

 

+        if cmd_opts.hide_ui_dir_config and key in restricted_opts:

+            return gr.update(value=oldval), opts.dumpjson()

+

         oldval = opts.data.get(key, None)

         opts.data[key] = value