From f8042cb323f0b581e3a49880dd0023e39d7dcc2c Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Sat, 9 Sep 2023 22:35:07 +0900
Subject: [PATCH 1/2] Ensure not override images with script enabled

---
 modules/img2img.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/img2img.py b/modules/img2img.py
index 7ca10cf07..52cb577a6 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -117,6 +117,7 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
         if output_dir:
             p.outpath_samples = output_dir
             p.override_settings['save_to_dirs'] = False
+            p.override_settings['save_images_replace_action'] = "Add number suffix"
             if p.n_iter > 1 or p.batch_size > 1:
                 p.override_settings['samples_filename_pattern'] = f'{image_path.stem}-[generation_number]'
             else:
@@ -125,6 +126,7 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
         proc = modules.scripts.scripts_img2img.run(p, *args)
 
         if proc is None:
+            p.override_settings.pop('save_images_replace_action', None)
             process_images(p)
 
 

From ab5741717546758c57cf6c2a040645ec2b44690a Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Sat, 9 Sep 2023 22:35:50 +0900
Subject: [PATCH 2/2] prevent accessing non-existing keys

---
 modules/processing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/processing.py b/modules/processing.py
index 0c1914286..618f8abee 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -711,7 +711,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
     if p.scripts is not None:
         p.scripts.before_process(p)
 
-    stored_opts = {k: opts.data[k] for k in p.override_settings.keys()}
+    stored_opts = {k: opts.data[k] for k in p.override_settings.keys() if k in opts.data}
 
     try:
         # if no checkpoint override or the override checkpoint can't be found, remove override entry and load opts checkpoint