Merge remote-tracking branch 'origin/master'

2 files changed, 2 insertions, 1 deletions

diff --git a/modules/scripts.py b/modules/scripts.py
index de8c5fc3..9cc5a185 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -92,6 +92,7 @@ class ScriptRunner:
 

         for script in self.scripts:

             script.args_from = len(inputs)

+            script.args_to = len(inputs)

 

             controls = wrap_call(script.ui, script.filename, "ui", is_img2img)

 

diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index e0c7f1d2..d9b01c81 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -33,7 +33,7 @@ class Script(scripts.Script):
 

         images = []

         for batch_no in range(batch_count):

-            state.job = f"{batch_no} out of {batch_count * p.n_iter}"

+            state.job = f"{batch_no + 1} out of {batch_count * p.n_iter}"

             p.prompt = lines[batch_no*p.batch_size:(batch_no+1)*p.batch_size] * p.n_iter

             proc = process_images(p)

             images += proc.images