mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 05:09:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_progress_reporter' into 'master'

Browse source 
Support frequency of ProgressReporter calls lower than interval

See merge request OpenMW/openmw!1569
This commit is contained in:
psi29a 2022-01-19 09:09:15 +00:00
commit 9f9e1b530f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/misc/progressreporter.hpp
View file

@ -29,10 +29,10 @@ namespace Misc
{
const std::lock_guard lock(mMutex);
const auto now = std::chrono::steady_clock::now();
const auto left = mNextReport - now;
if (left.count() > 0 || provided == expected)
if (mNextReport > now || provided == expected)
return false;
mNextReport += mInterval + left;
if (mInterval.count() > 0)
mNextReport = mNextReport + mInterval * ((now - mNextReport + mInterval).count() / mInterval.count());
return true;
} ();
if (shouldReport)