mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2025-08-03 10:50:23 +00:00
fix borked merge, rename fields to better match what they do, change setting default to true for #13653
This commit is contained in:
@@ -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:
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user