diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2024-01-01 13:40:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-01 13:40:02 +0000 |
| commit | 2a7ad70db5447dd1d5915b2b59715ee74f670119 (patch) | |
| tree | 3b1b2f5f3648da07430f54d1c155ce379a6fa3f7 /scripts | |
| parent | 0ce67cb61806cf43f4d726d4705a4f6fdc2540e6 (diff) | |
| parent | dfd64382211317cc46ad337c373492bfc420fa18 (diff) | |
| download | stable-diffusion-webui-gfx803-2a7ad70db5447dd1d5915b2b59715ee74f670119.tar.gz stable-diffusion-webui-gfx803-2a7ad70db5447dd1d5915b2b59715ee74f670119.tar.bz2 stable-diffusion-webui-gfx803-2a7ad70db5447dd1d5915b2b59715ee74f670119.zip | |
Merge pull request #13653 from antfu/feat/interrupted-end
Interrupt after current generation
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/loopback.py | 6 | ||||
| -rw-r--r-- | scripts/xyz_grid.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/loopback.py b/scripts/loopback.py index 2d5feaf9..ad921269 100644 --- a/scripts/loopback.py +++ b/scripts/loopback.py @@ -95,7 +95,7 @@ class Script(scripts.Script): processed = processing.process_images(p)
# Generation cancelled.
- if state.interrupted:
+ if state.interrupted or state.interrupted_next:
break
if initial_seed is None:
@@ -122,8 +122,8 @@ class Script(scripts.Script): p.inpainting_fill = original_inpainting_fill
- if state.interrupted:
- break
+ if state.interrupted or state.interrupted_next:
+ break
if len(history) > 1:
grid = images.image_grid(history, rows=1)
diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py index 2d550994..2deff365 100644 --- a/scripts/xyz_grid.py +++ b/scripts/xyz_grid.py @@ -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:
+ if shared.state.interrupted or state.interrupted_next:
return Processed(p, [], p.seed, "")
pc = copy(p)
|