fix merge issue

This commit is contained in:
Guenter Obiltschnig 2016-02-13 23:38:00 +01:00
parent 2522aefaf0
commit 53c07395c5

View File

@ -95,9 +95,9 @@ void Task::setProgress(float progress)
{
FastMutex::ScopedLock lock(_mutex);
if (_progress != taskProgress)
if (_progress != progress)
{
_progress = taskProgress;
_progress = progress;
if (_pOwner)
_pOwner->taskProgress(this, _progress);
}