aboutsummaryrefslogtreecommitdiffstats
path: root/modules/images.py
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2022-10-02 18:33:22 +0000
committerGitHub <noreply@github.com>2022-10-02 18:33:22 +0000
commit688c4a914a6cb152b5f5e4088bace709ed3dcc35 (patch)
tree39c3221e99ca90b7238057bc555c5b4d63fcf960 /modules/images.py
parenta634c3226fd69486ce96df56f95f3fd63172305c (diff)
parent852fd90c0dcda9cb5fbbfdf0c7308ce58034935c (diff)
downloadstable-diffusion-webui-gfx803-688c4a914a6cb152b5f5e4088bace709ed3dcc35.tar.gz
stable-diffusion-webui-gfx803-688c4a914a6cb152b5f5e4088bace709ed3dcc35.tar.bz2
stable-diffusion-webui-gfx803-688c4a914a6cb152b5f5e4088bace709ed3dcc35.zip
Merge branch 'master' into 1404-script-reload-without-restart
Diffstat (limited to 'modules/images.py')
-rw-r--r--modules/images.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/images.py b/modules/images.py
index f1aed5d6..d7563244 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -311,7 +311,12 @@ def apply_filename_pattern(x, p, seed, prompt):
x = x.replace("[cfg]", str(p.cfg_scale))
x = x.replace("[width]", str(p.width))
x = x.replace("[height]", str(p.height))
- x = x.replace("[styles]", sanitize_filename_part(", ".join([x for x in p.styles if not x == "None"]), replace_spaces=False))
+
+ #currently disabled if using the save button, will work otherwise
+ # if enabled it will cause a bug because styles is not included in the save_files data dictionary
+ if hasattr(p, "styles"):
+ x = x.replace("[styles]", sanitize_filename_part(", ".join([x for x in p.styles if not x == "None"]), replace_spaces=False))
+
x = x.replace("[sampler]", sanitize_filename_part(sd_samplers.samplers[p.sampler_index].name, replace_spaces=False))
x = x.replace("[model_hash]", shared.sd_model.sd_model_hash)