From: Carl Hetherington Date: Sat, 24 Dec 2022 23:22:16 +0000 (+0100) Subject: Cleanup: remove unnecessary variable. X-Git-Tag: v2.16.38~10 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=dc06f6e964fa3baffc72d6548e47974468f2939f Cleanup: remove unnecessary variable. --- diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc index 7a6bda840..2b4e87299 100644 --- a/src/lib/job_manager.cc +++ b/src/lib/job_manager.cc @@ -331,7 +331,7 @@ JobManager::pause () { boost::mutex::scoped_lock lm (_mutex); - if (_paused) { + if (_paused_job) { return; } @@ -340,8 +340,6 @@ JobManager::pause () _paused_job = i; } } - - _paused = true; } @@ -349,14 +347,11 @@ void JobManager::resume () { boost::mutex::scoped_lock lm (_mutex); - if (!_paused) { - return; - } - if (_paused_job) { - _paused_job->resume (); + if (!_paused_job) { + return; } - _paused_job.reset (); - _paused = false; + _paused_job->resume(); + _paused_job.reset(); } diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h index 71db33fd6..6802b5115 100644 --- a/src/lib/job_manager.h +++ b/src/lib/job_manager.h @@ -62,7 +62,7 @@ public: void resume (); bool paused () const { boost::mutex::scoped_lock lm (_mutex); - return _paused; + return static_cast(_paused_job); } void analyse_audio ( @@ -104,7 +104,6 @@ private: std::list> _jobs; std::list _connections; bool _terminate = false; - bool _paused = false; std::shared_ptr _paused_job; boost::optional _last_active_job;