mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-26 02:18:04 +01:00
fix merge issue
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user