fix borked merge, rename fields to better match what they do, change setting default to true for #13653

This commit is contained in:
AUTOMATIC1111
2024-01-01 16:50:59 +03:00
parent 2a7ad70db5
commit 0aa7c53c0b
8 changed files with 20 additions and 14 deletions

View File

@@ -95,7 +95,7 @@ class Script(scripts.Script):
processed = processing.process_images(p)
# Generation cancelled.
if state.interrupted or state.interrupted_next:
if state.interrupted or state.stopping_generation:
break
if initial_seed is None:
@@ -122,7 +122,7 @@ class Script(scripts.Script):
p.inpainting_fill = original_inpainting_fill
if state.interrupted or state.interrupted_next:
if state.interrupted or state.stopping_generation:
break
if len(history) > 1:

View File

@@ -696,7 +696,7 @@ class Script(scripts.Script):
grid_infotext = [None] * (1 + len(zs))
def cell(x, y, z, ix, iy, iz):
if shared.state.interrupted or state.interrupted_next:
if shared.state.interrupted or state.stopping_generation:
return Processed(p, [], p.seed, "")
pc = copy(p)