d588620e70bf15da29cc242e4ae8d86977e8f36a from master; fix hang if you cancel a paused...

diff --git a/TO_PORT b/TO_PORT
index 121eab049cbd86580479dd801a06b097557a063e..b97043bb1fa9ac2b6f92fec4bbc34a740c711f30 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,5 +1,3 @@
-dd843f32f8f915a2fe984126ac338b26fa83546d
-c13575f0483d6e92956fa7fb2e424572702236dc
 33a2bece96b7875134c99a2053a2fc59e828ae33
 b41b6528fbe0d270415a8500a612da19469e49e4
 c040b70eb777630ef0fdbb80cd419f6b3da4b46e

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