diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-07-06 23:09:08 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-01-28 02:01:57 +0100 |
| commit | c80eca531e01860e6714f526b2efb07a58c2e26e (patch) | |
| tree | 8b2ca4b071b6def5f2e9e85809b6bc25caa81586 /src/lib/job.cc | |
| parent | 3299d48531d631264dacd01faf1fa3c069b28e62 (diff) | |
Patch from Aaron Boxer adding initial support for GPU-powered J2K encoding via his tool "grok".
Diffstat (limited to 'src/lib/job.cc')
| -rw-r--r-- | src/lib/job.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc index 9c9530b7a..9e685ec11 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -662,7 +662,7 @@ void Job::cancel () { if (_thread.joinable()) { - resume(); + Job::resume(); _thread.interrupt (); _thread.join (); @@ -689,6 +689,7 @@ Job::pause_by_user () } if (paused) { + pause(); _pause_changed.notify_all (); } @@ -701,6 +702,7 @@ Job::pause_by_priority () { if (running ()) { set_state (PAUSED_BY_PRIORITY); + pause(); _pause_changed.notify_all (); } } |