From: Carl Hetherington Date: Sat, 6 Aug 2022 20:58:36 +0000 (+0200) Subject: Cleanup: don't repeat check inside resume() before calling it. X-Git-Tag: v2.16.20~6 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=da75178e689a48dc689b70e0880a45f0cf8c07a8 Cleanup: don't repeat check inside resume() before calling it. --- diff --git a/src/lib/job.cc b/src/lib/job.cc index 8f0a7474f..1c7fe5a83 100644 --- 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 ();