From 16e7ac09df1cef85781494a1234a7aa3c51fb4a9 Mon Sep 17 00:00:00 2001
From: DepFA <35278260+dfaker@users.noreply.github.com>
Date: Tue, 27 Sep 2022 02:26:13 +0100
Subject: job_timestamp initialization change

---
 modules/shared.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules')

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")
 
-- 
cgit v1.2.1


From 8dcac9ac81db587cdac59d01db85c01579156392 Mon Sep 17 00:00:00 2001
From: Daniel <113887727+mortstraze@users.noreply.github.com>
Date: Mon, 26 Sep 2022 19:30:18 +1000
Subject: Grids saving to subdirectory when setting unchecked

Fixed grids saving to subdirectory when the setting is unchecked but "save images to subdirectory" was checked.
---
 modules/processing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

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)
-- 
cgit v1.2.1