mirror of
https://github.com/pocoproject/poco.git
synced 2025-04-23 16:52:44 +02:00
fix merge issue
This commit is contained in:
parent
2522aefaf0
commit
53c07395c5
@ -95,9 +95,9 @@ void Task::setProgress(float progress)
|
|||||||
{
|
{
|
||||||
FastMutex::ScopedLock lock(_mutex);
|
FastMutex::ScopedLock lock(_mutex);
|
||||||
|
|
||||||
if (_progress != taskProgress)
|
if (_progress != progress)
|
||||||
{
|
{
|
||||||
_progress = taskProgress;
|
_progress = progress;
|
||||||
if (_pOwner)
|
if (_pOwner)
|
||||||
_pOwner->taskProgress(this, _progress);
|
_pOwner->taskProgress(this, _progress);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user