diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-25 14:49:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-25 14:49:43 +0100 |
| commit | 1004209bb71feb33688e9dffed89313e103db4c0 (patch) | |
| tree | 3623a6dfb11d24d55803497d4134799ac162fd57 /src/lib/job.cc | |
| parent | be32d0b93234df78d89a3208936167e98dc47ccc (diff) | |
d588620e70bf15da29cc242e4ae8d86977e8f36a from master; fix hang if you cancel a paused job.
Diffstat (limited to 'src/lib/job.cc')
| -rw-r--r-- | src/lib/job.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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 (); } |