diff options
| author | B Stack <bgstack15@gmail.com> | 2018-11-15 11:22:00 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-11-15 11:22:00 +0000 |
| commit | 77c5c2503d459288720a8894349ac74e5eeec7c6 (patch) | |
| tree | 30bf08d782d58174a0ca212b2e4b172fabd9c42c /wx+/async_task.h | |
| parent | Merge branch '10.5' into 'master' (diff) | |
| parent | 10.6 (diff) | |
| download | FreeFileSync-77c5c2503d459288720a8894349ac74e5eeec7c6.tar.gz FreeFileSync-77c5c2503d459288720a8894349ac74e5eeec7c6.tar.bz2 FreeFileSync-77c5c2503d459288720a8894349ac74e5eeec7c6.zip | |
Merge branch '10.6' into 'master'10.6
10.6
See merge request opensource-tracking/FreeFileSync!3
Diffstat (limited to 'wx+/async_task.h')
| -rwxr-xr-x | wx+/async_task.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wx+/async_task.h b/wx+/async_task.h index df4c3ec6..074f5337 100755 --- a/wx+/async_task.h +++ b/wx+/async_task.h @@ -83,9 +83,9 @@ public: inRecursion_ = true; ZEN_ON_SCOPE_EXIT(inRecursion_ = false); - std::vector<std::unique_ptr<Task>> readyTasks; //Reentrancy; access to AsyncTasks::add is not protected! => evaluate outside erase_if + std::vector<std::unique_ptr<Task>> readyTasks; //Reentrancy; access to AsyncTasks::add is not protected! => evaluate outside eraseIf - erase_if(tasks_, [&](std::unique_ptr<Task>& task) + eraseIf(tasks_, [&](std::unique_ptr<Task>& task) { if (task->resultReady()) { |