From 4a666381bf98333ba4512db0f0033df5f6a08771 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 2 Dec 2023 12:11:21 +0300
Subject: extras tab batch: actually use original filename preprocessing
 upscale: do not do an extra upscale step if it's not needed

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

(limited to 'modules/postprocessing.py')

diff --git a/modules/postprocessing.py b/modules/postprocessing.py
index fd0c0cc9..0a134ee4 100644
--- a/modules/postprocessing.py
+++ b/modules/postprocessing.py
@@ -60,8 +60,10 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
 
         if opts.use_original_name_batch and name is not None:
             basename = os.path.splitext(os.path.basename(name))[0]
+            forced_filename = basename
         else:
             basename = ''
+            forced_filename = None
 
         infotext = ", ".join([k if k == v else f'{k}: {generation_parameters_copypaste.quote(v)}' for k, v in pp.info.items() if v is not None])
 
@@ -70,7 +72,7 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
             pp.image.info["postprocessing"] = infotext
 
         if save_output:
-            images.save_image(pp.image, path=outpath, basename=basename, seed=None, prompt=None, extension=opts.samples_format, info=infotext, short_filename=True, no_prompt=True, grid=False, pnginfo_section_name="extras", existing_info=existing_pnginfo, forced_filename=None)
+            images.save_image(pp.image, path=outpath, basename=basename, extension=opts.samples_format, info=infotext, short_filename=True, no_prompt=True, grid=False, pnginfo_section_name="extras", existing_info=existing_pnginfo, forced_filename=forced_filename)
 
         if extras_mode != 2 or show_extras_results:
             outputs.append(pp.image)
-- 
cgit v1.2.3