diff options
| author | liamkerr <liamkerr@users.noreply.github.com> | 2022-10-02 14:26:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 14:26:20 +0000 |
| commit | a32a068ed13f877560cfdddcfb0b606f476a5728 (patch) | |
| tree | 9968de192a5ef38d9143315e638885ad64858570 /modules/images.py | |
| parent | 7308aeefd9d25212398068c1a35f0b879b9ba06f (diff) | |
| parent | f34e2293d0abffc412150f54ebb5c626101f6359 (diff) | |
| download | stable-diffusion-webui-gfx803-a32a068ed13f877560cfdddcfb0b606f476a5728.tar.gz stable-diffusion-webui-gfx803-a32a068ed13f877560cfdddcfb0b606f476a5728.tar.bz2 stable-diffusion-webui-gfx803-a32a068ed13f877560cfdddcfb0b606f476a5728.zip | |
Merge branch 'master' into token_updates
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)
|