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

1 files changed, 6 insertions, 6 deletions

diff --git a/modules/shared_state.py b/modules/shared_state.py
index 532fdcd8..33996691 100644
--- a/modules/shared_state.py
+++ b/modules/shared_state.py
@@ -12,7 +12,7 @@ log = logging.getLogger(__name__)
 class State:

     skipped = False

     interrupted = False

-    interrupted_next = False

+    stopping_generation = False

     job = ""

     job_no = 0

     job_count = 0

@@ -80,9 +80,9 @@ class State:
         self.interrupted = True

         log.info("Received interrupt request")

 

-    def interrupt_next(self):

-        self.interrupted_next = True

-        log.info("Received interrupt request, interrupt after current job")

+    def stop_generating(self):

+        self.stopping_generation = True

+        log.info("Received stop generating request")

 

     def nextjob(self):

         if shared.opts.live_previews_enable and shared.opts.show_progress_every_n_steps == -1:

@@ -96,7 +96,7 @@ class State:
         obj = {

             "skipped": self.skipped,

             "interrupted": self.interrupted,

-            "interrupted_next": self.interrupted_next,

+            "stopping_generation": self.stopping_generation,

             "job": self.job,

             "job_count": self.job_count,

             "job_timestamp": self.job_timestamp,

@@ -120,7 +120,7 @@ class State:
         self.id_live_preview = 0

         self.skipped = False

         self.interrupted = False

-        self.interrupted_next = False

+        self.stopping_generation = False

         self.textinfo = None

         self.job = job

         devices.torch_gc()