From 8aa13d5dce2789a7d0bd802e6d62453b3c380496 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Mon, 16 Oct 2023 14:12:18 +0800
Subject: Interrupt after current generation

---
 modules/shared_state.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'modules/shared_state.py')

diff --git a/modules/shared_state.py b/modules/shared_state.py
index a68789cc..c72c3f63 100644
--- a/modules/shared_state.py
+++ b/modules/shared_state.py
@@ -12,6 +12,7 @@ log = logging.getLogger(__name__)
 class State:
     skipped = False
     interrupted = False
+    interrupted_next = False
     job = ""
     job_no = 0
     job_count = 0
@@ -76,8 +77,12 @@ class State:
         log.info("Received skip request")
 
     def interrupt(self):
-        self.interrupted = True
-        log.info("Received interrupt request")
+        if shared.opts.interrupt_after_current and self.job_count > 1:
+            self.interrupted_next = True
+            log.info("Received interrupt request, interrupt after current job")
+        else:
+            self.interrupted = True
+            log.info("Received interrupt request")
 
     def nextjob(self):
         if shared.opts.live_previews_enable and shared.opts.show_progress_every_n_steps == -1:
@@ -91,6 +96,7 @@ class State:
         obj = {
             "skipped": self.skipped,
             "interrupted": self.interrupted,
+            "interrupted_next": self.interrupted_next,
             "job": self.job,
             "job_count": self.job_count,
             "job_timestamp": self.job_timestamp,
@@ -114,6 +120,7 @@ class State:
         self.id_live_preview = 0
         self.skipped = False
         self.interrupted = False
+        self.interrupted_next = False
         self.textinfo = None
         self.job = job
         devices.torch_gc()
-- 
cgit v1.2.3


From 3d15e58b0a30f2ef1e731f9e429f4d3cf1c259c5 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Mon, 16 Oct 2023 15:00:17 +0800
Subject: feat: refactor

---
 modules/shared_state.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules/shared_state.py')

diff --git a/modules/shared_state.py b/modules/shared_state.py
index c72c3f63..532fdcd8 100644
--- a/modules/shared_state.py
+++ b/modules/shared_state.py
@@ -77,12 +77,12 @@ class State:
         log.info("Received skip request")
 
     def interrupt(self):
-        if shared.opts.interrupt_after_current and self.job_count > 1:
-            self.interrupted_next = True
-            log.info("Received interrupt request, interrupt after current job")
-        else:
-            self.interrupted = True
-            log.info("Received interrupt request")
+        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 nextjob(self):
         if shared.opts.live_previews_enable and shared.opts.show_progress_every_n_steps == -1:
-- 
cgit v1.2.3


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

---
 modules/shared_state.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules/shared_state.py')

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()
-- 
cgit v1.2.3