From 0aa7c53c0b9469849377aff83f43c9f75c19b3fa Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Mon, 1 Jan 2024 16:50:59 +0300
Subject: fix borked merge, rename fields to better match what they do, change
 setting default to true for #13653

---
 scripts/loopback.py | 4 ++--
 scripts/xyz_grid.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/loopback.py b/scripts/loopback.py
index ad921269..800ee882 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 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:
diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index 2deff365..2f385ebf 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 or state.interrupted_next:
+            if shared.state.interrupted or state.stopping_generation:
                 return Processed(p, [], p.seed, "")
 
             pc = copy(p)
-- 
cgit v1.2.3