From 1fe717e9125e896c92f281922e87f8158b15c7af Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 6 Aug 2022 22:57:58 +0200
Subject: Allow cancellation of un-started jobs (#2777).

---
 src/lib/job.cc | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 5bed3f0d2..8f0a7474f 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -589,17 +589,15 @@ Job::remaining_time () const
 void
 Job::cancel ()
 {
-	if (!_thread.joinable()) {
-		return;
-	}
+	if (_thread.joinable()) {
+		if (paused_by_user() || paused_by_priority()) {
+			resume ();
+		}
 
-	if (paused_by_user() || paused_by_priority()) {
-		resume ();
+		_thread.interrupt ();
+		_thread.join ();
 	}
 
-	_thread.interrupt ();
-	_thread.join ();
-
 	set_state (FINISHED_CANCELLED);
 }
 
-- 
cgit v1.2.3