1 files changed, 15 insertions, 3 deletions
diff --git a/modules/images.py b/modules/images.py
index 334f8fec..d742ed98 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -135,7 +135,12 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts):
 
     fontsize = (width + height) // 25
     line_spacing = fontsize // 2
-    fnt = ImageFont.truetype(opts.font or Roboto, fontsize)
+
+    try:
+        fnt = ImageFont.truetype(opts.font or Roboto, fontsize)
+    except Exception:
+        fnt = ImageFont.truetype(Roboto, fontsize)
+
     color_active = (0, 0, 0)
     color_inactive = (153, 153, 153)
 
@@ -247,7 +252,7 @@ def sanitize_filename_part(text, replace_spaces=True):
     return text.translate({ord(x): '' for x in invalid_filename_chars})[:128]
 
 
-def save_image(image, path, basename, seed=None, prompt=None, extension='png', info=None, short_filename=False, no_prompt=False, pnginfo_section_name='parameters', p=None):
+def save_image(image, path, basename, seed=None, prompt=None, extension='png', info=None, short_filename=False, no_prompt=False, pnginfo_section_name='parameters', p=None, existing_info=None):
     # would be better to add this as an argument in future, but will do for now
     is_a_grid = basename != ""
 
@@ -258,7 +263,9 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
     else:
         file_decoration = opts.samples_filename_format or "[seed]-[prompt_spaces]"
 
-    file_decoration = "-" + file_decoration.lower()
+    if file_decoration != "":
+        file_decoration = "-" + file_decoration.lower()
+
     if seed is not None:
         file_decoration = file_decoration.replace("[seed]", str(seed))
     if prompt is not None:
@@ -273,6 +280,11 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
 
     if extension == 'png' and opts.enable_pnginfo and info is not None:
         pnginfo = PngImagePlugin.PngInfo()
+
+        if existing_info is not None:
+            for k, v in existing_info.items():
+                pnginfo.add_text(k, v)
+
         pnginfo.add_text(pnginfo_section_name, info)
     else:
         pnginfo = None