Merge branch 'dev' into master

1 files changed, 8 insertions, 2 deletions

diff --git a/modules/postprocessing.py b/modules/postprocessing.py
index 09d8e605..4dc1a2ab 100644
--- a/modules/postprocessing.py
+++ b/modules/postprocessing.py
@@ -18,9 +18,15 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
 

     if extras_mode == 1:

         for img in image_folder:

-            image = Image.open(img)

+            if isinstance(img, Image.Image):

+                image = img

+                fn = ''

+            else:

+                image = Image.open(os.path.abspath(img.name))

+                fn = os.path.splitext(img.orig_name)[0]

+

             image_data.append(image)

-            image_names.append(os.path.splitext(img.orig_name)[0])

+            image_names.append(fn)

     elif extras_mode == 2:

         assert not shared.cmd_opts.hide_ui_dir_config, '--hide-ui-dir-config option must be disabled'

         assert input_dir, 'input directory not selected'