From 28365d6b691e2304c383f6106cdaf0d5b0b17ffc Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Wed, 8 Nov 2023 12:09:09 -0500
Subject: [PATCH 1/2] fix forced filename

---
 modules/images.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/images.py b/modules/images.py
index 2c4ecefe4..072604409 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -559,16 +559,17 @@ def save_image(image, path, basename = '', seed=None, prompt=None, extension=sha
     if shared.opts.save_to_dirs:
         dirname = namegen.apply(shared.opts.directories_filename_pattern or "[prompt_words]")
         path = os.path.join(path, dirname)
+    file_decoration = ''
     if forced_filename is None:
-        if short_filename or seed is None:
-            file_decoration = ""
         if shared.opts.samples_filename_pattern and len(shared.opts.samples_filename_pattern) > 0:
             file_decoration = shared.opts.samples_filename_pattern
         else:
             file_decoration = "[seq]-[prompt_words]"
         file_decoration = namegen.apply(file_decoration)
         file_decoration += suffix
-    filename = os.path.join(path, f"{file_decoration}.{extension}") if basename == '' else os.path.join(path, f"{basename}-{file_decoration}.{extension}")
+        filename = os.path.join(path, f"{file_decoration}.{extension}") if basename == '' else os.path.join(path, f"{basename}-{file_decoration}.{extension}")
+    else:
+        filename = forced_filename
     pnginfo = existing_info or {}
     if info is not None:
         pnginfo[pnginfo_section_name] = info

From 3c9c9cf471ec16c57f2e08caaf3bbab067c66c65 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Wed, 8 Nov 2023 12:21:36 -0500
Subject: [PATCH 2/2] fix paste parser

---
 modules/generation_parameters_copypaste.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index fb54cfb9e..1ec23abc6 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -206,12 +206,14 @@ def parse_generation_parameters(x: str):
     res = {}
     if x is None:
         return res
-    remaining = x.strip()
+    remaining = x.replace('\n', ' ').strip()
     if len(remaining) == 0:
         return res
     remaining = x[7:] if x.startswith('Prompt: ') else x
-    res["Prompt"], remaining = remaining.split(' Negative prompt: ', maxsplit=1) if ' Negative prompt: ' in remaining else (remaining, '')
-    res["Negative prompt"], remaining = remaining.split(' Steps: ', maxsplit=1) if ' Steps: ' in remaining else (remaining, None)
+    prompt, remaining = remaining.split('Negative prompt: ', maxsplit=1) if 'Negative prompt: ' in remaining else (remaining, '')
+    res["Prompt"] = prompt.strip()
+    negative, remaining = remaining.split('Steps: ', maxsplit=1) if 'Steps: ' in remaining else (remaining, None)
+    res["Negative prompt"] = negative.strip()
     if remaining is None:
         return res
     remaining = f'Steps: {remaining}'