From a6496d646f940acca51a57bac2d89599b839a265 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 9 Jul 2025 10:28:50 +1200
Subject: [PATCH] Cancel shouldn't use timeout logic

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

diff --git a/sbysrc/sby_core.py b/sbysrc/sby_core.py
index b46b1cf..93b7477 100644
--- a/sbysrc/sby_core.py
+++ b/sbysrc/sby_core.py
@@ -151,8 +151,8 @@ class SbyProc:
         if self.error_callback is not None:
             self.error_callback(retcode)
 
-    def terminate(self, timeout=False):
-        if (self.task.opt_wait or self.wait) and not timeout:
+    def terminate(self, force=False):
+        if (self.task.opt_wait or self.wait) and not force:
             return
         if self.running:
             if not self.silent:
@@ -1306,18 +1306,18 @@ class SbyTask(SbyConfig):
             self.models[model_name] = self.make_model(model_name)
         return self.models[model_name]
 
-    def terminate(self, timeout=False):
+    def terminate(self, timeout=False, cancel=False):
         if timeout:
             self.timeout_reached = True
         for proc in list(self.procs_running):
-            proc.terminate(timeout=timeout)
+            proc.terminate(timeout or cancel)
         for proc in list(self.procs_pending):
-            proc.terminate(timeout=timeout)
+            proc.terminate(timeout or cancel)
         if timeout:
             self.update_unknown_props(dict(source="timeout"))
             
     def cancel(self):
-        self.terminate(True)
+        self.terminate(cancel=True)
         self.update_status("CANCELLED")
 
     def proc_failed(self, proc):