aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-08-21 05:58:15 +0000
committerAUTOMATIC1111 <16777216c@gmail.com>2023-08-21 05:58:15 +0000
commitd02c4da483a656331f641224fe5da5f694580066 (patch)
tree9c73c355b64e48955f1617e416febf338e94fe3a
parentdf595ae3135ef12c135f43ef2a0f792708aab4b3 (diff)
downloadstable-diffusion-webui-gfx803-d02c4da483a656331f641224fe5da5f694580066.tar.gz
stable-diffusion-webui-gfx803-d02c4da483a656331f641224fe5da5f694580066.tar.bz2
stable-diffusion-webui-gfx803-d02c4da483a656331f641224fe5da5f694580066.zip
also prevent changing API options via override_settings
-rw-r--r--modules/options.py4
-rwxr-xr-xmodules/processing.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/options.py b/modules/options.py
index 41d1b672..758b1ce5 100644
--- a/modules/options.py
+++ b/modules/options.py
@@ -116,7 +116,7 @@ class Options:
return super(Options, self).__getattribute__(item)
- def set(self, key, value, is_api=False):
+ def set(self, key, value, is_api=False, run_callbacks=True):
"""sets an option and calls its onchange callback, returning True if the option changed and False otherwise"""
oldval = self.data.get(key, None)
@@ -135,7 +135,7 @@ class Options:
except RuntimeError:
return False
- if option.onchange is not None:
+ if run_callbacks and option.onchange is not None:
try:
option.onchange()
except Exception as e:
diff --git a/modules/processing.py b/modules/processing.py
index d4926524..e60cc92b 100755
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -709,7 +709,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
sd_models.reload_model_weights()
for k, v in p.override_settings.items():
- setattr(opts, k, v)
+ opts.set(k, v, is_api=True, run_callbacks=False)
if k == 'sd_model_checkpoint':
sd_models.reload_model_weights()