diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2022-10-03 04:54:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 04:54:57 +0000 |
| commit | 3fac3764b3fadce828ceffdb7dea2be51bbe7da7 (patch) | |
| tree | b2307b40ed86dc825d9954f470a2b1663dfed30a /modules/images.py | |
| parent | 32edf1732f27a1fad5133667c22b948adda1b070 (diff) | |
| parent | 4c2eccf8e96825333ed400f8a8a2be78141ed8ec (diff) | |
| download | stable-diffusion-webui-gfx803-3fac3764b3fadce828ceffdb7dea2be51bbe7da7.tar.gz stable-diffusion-webui-gfx803-3fac3764b3fadce828ceffdb7dea2be51bbe7da7.tar.bz2 stable-diffusion-webui-gfx803-3fac3764b3fadce828ceffdb7dea2be51bbe7da7.zip | |
Merge branch 'master' into #1484_fix_empty_styles_pattern
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 4998e92c..bba55158 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"]) or "No styles", 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"] or "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)
|