diff options
author | AUTOMATIC <16777216c@gmail.com> | 2022-10-02 14:25:28 +0000 |
---|---|---|
committer | AUTOMATIC <16777216c@gmail.com> | 2022-10-02 14:25:28 +0000 |
commit | f34e2293d0abffc412150f54ebb5c626101f6359 (patch) | |
tree | 4a94ada02762638f2473e1e45a47ceaf708a99bc /modules/images.py | |
parent | 0758f6e641b5790ce566a998d43e0ea74a627766 (diff) | |
parent | 1955ca62a8f053c82ccef125b65b0e6571904347 (diff) | |
download | stable-diffusion-webui-gfx803-f34e2293d0abffc412150f54ebb5c626101f6359.tar.gz stable-diffusion-webui-gfx803-f34e2293d0abffc412150f54ebb5c626101f6359.tar.bz2 stable-diffusion-webui-gfx803-f34e2293d0abffc412150f54ebb5c626101f6359.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'modules/images.py')
-rw-r--r-- | modules/images.py | 7 |
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)
|