From 1004209bb71feb33688e9dffed89313e103db4c0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 25 May 2015 14:49:43 +0100
Subject: d588620e70bf15da29cc242e4ae8d86977e8f36a from master; fix hang if you
 cancel a paused job.

---
 src/lib/job.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/lib')

diff --git a/src/lib/job.cc b/src/lib/job.cc
index e5d0933f8..286b38456 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -379,6 +379,10 @@ Job::cancel ()
 		return;
 	}
 
+	if (paused ()) {
+		resume ();
+	}
+
 	_thread->interrupt ();
 	_thread->join ();
 }
-- 
cgit v1.2.3