projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1fe717e
)
Cleanup: don't repeat check inside resume() before calling it.
author
Carl Hetherington
<cth@carlh.net>
Sat, 6 Aug 2022 20:58:36 +0000
(22:58 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 11 Aug 2022 20:40:59 +0000
(22:40 +0200)
src/lib/job.cc
patch
|
blob
|
history
diff --git
a/src/lib/job.cc
b/src/lib/job.cc
index 8f0a7474f90311ffc8c3fa912bc9b22ca57dad1e..1c7fe5a83ff5d333eafa62141fce4ec3c00e059e 100644
(file)
--- a/
src/lib/job.cc
+++ b/
src/lib/job.cc
@@
-590,9
+590,7
@@
void
Job::cancel ()
{
if (_thread.joinable()) {
- if (paused_by_user() || paused_by_priority()) {
- resume ();
- }
+ resume();
_thread.interrupt ();
_thread.join ();