Merge branch 'grok2' into v2.17.xv2.17.8

This is the DoM support for Aaron Boxer's "grok" GPU J2K encoder,
with some cleanups and other assorted/related DoM changes.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 727456523..e900a427c 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -655,7 +655,7 @@ void
 Job::cancel ()
 {
 	if (_thread.joinable()) {
-		resume();
+		Job::resume();
 
 		_thread.interrupt ();
 		_thread.join ();
@@ -682,6 +682,7 @@ Job::pause_by_user ()
 	}
 
 	if (paused) {
+		pause();
 		_pause_changed.notify_all ();
 	}
 
@@ -694,6 +695,7 @@ Job::pause_by_priority ()
 {
 	if (running ()) {
 		set_state (PAUSED_BY_PRIORITY);
+		pause();
 		_pause_changed.notify_all ();
 	}
 }