teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

LoadingScreen: ensure values are within progress range

Browse source
This commit is contained in:
scrawl 2015-12-15 21:05:35 +01:00
parent 625644e917
commit 67883feaae
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/loadingscreen.cpp
View file

@ -209,6 +209,7 @@ namespace MWGui
// skip expensive update if there isn't enough visible progress // skip expensive update if there isn't enough visible progress
if (value - mProgress < mProgressBar->getScrollRange()/200.f) if (value - mProgress < mProgressBar->getScrollRange()/200.f)
return; return;
value = std::min(value, mProgressBar->getScrollRange()-1);
mProgress = value; mProgress = value;
mProgressBar->setScrollPosition(0); mProgressBar->setScrollPosition(0);
mProgressBar->setTrackSize(static_cast<int>(value / (float)(mProgressBar->getScrollRange()) * mProgressBar->getLineSize())); mProgressBar->setTrackSize(static_cast<int>(value / (float)(mProgressBar->getScrollRange()) * mProgressBar->getLineSize()));
@ -219,6 +220,7 @@ namespace MWGui
{ {
mProgressBar->setScrollPosition(0); mProgressBar->setScrollPosition(0);
size_t value = mProgress + increase; size_t value = mProgress + increase;
value = std::min(value, mProgressBar->getScrollRange()-1);
mProgress = value; mProgress = value;
mProgressBar->setTrackSize(static_cast<int>(value / (float)(mProgressBar->getScrollRange()) * mProgressBar->getLineSize())); mProgressBar->setTrackSize(static_cast<int>(value / (float)(mProgressBar->getScrollRange()) * mProgressBar->getLineSize()));
draw(); draw();