diff options
| author | 48DESIGN <github@48design.de> | 2022-09-27 08:05:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-27 08:05:19 +0200 |
| commit | e4145c84537b563a4b0ad7d225764f8c446479b5 (patch) | |
| tree | 7a3aa1a9e22632eeb29bab969bd1cf61f8c9ca0f /modules | |
| parent | 2846ca57028cca1a9ce9cee66d2500b4ac38a9c6 (diff) | |
| parent | c0b1177a3203091ca43f2d08f24dd821f1237612 (diff) | |
Merge branch 'master' into notification-sound
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/processing.py | 2 | ||||
| -rw-r--r-- | modules/shared.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/processing.py b/modules/processing.py index 0246e094..3abf3181 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -406,7 +406,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed: index_of_first_image = 1
if opts.grid_save:
- images.save_image(grid, p.outpath_grids, "grid", all_seeds[0], all_prompts[0], opts.grid_format, info=infotext(), short_filename=not opts.grid_extended_filename, p=p)
+ images.save_image(grid, p.outpath_grids, "grid", all_seeds[0], all_prompts[0], opts.grid_format, info=infotext(), short_filename=not opts.grid_extended_filename, p=p, grid=True)
devices.torch_gc()
return Processed(p, output_images, all_seeds[0], infotext(), subseed=all_subseeds[0], all_prompts=all_prompts, all_seeds=all_seeds, all_subseeds=all_subseeds, index_of_first_image=index_of_first_image)
diff --git a/modules/shared.py b/modules/shared.py index c32da110..bd030fe8 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -66,7 +66,7 @@ class State: job = ""
job_no = 0
job_count = 0
- job_timestamp = 0
+ job_timestamp = '0'
sampling_step = 0
sampling_steps = 0
current_latent = None
@@ -80,6 +80,7 @@ class State: self.job_no += 1
self.sampling_step = 0
self.current_image_sampling_step = 0
+
def get_job_timestamp(self):
return datetime.datetime.now().strftime("%Y%m%d%H%M%S")
|