tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] Fix a bug when canceling tasks

Browse Source 
If the next task in the queue gets canceled, we need to
adjust the iterator to the next task, otherwise a canceled
task gets executed.
This commit is contained in:
Thiago Marcos P. Santos
2016-07-04 19:22:21 +03:00
parent 70d4ebb347
commit e579199ac1
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platform/android/src/run_loop.cpp
View File

@@ -123,10 +123,16 @@ void RunLoop::Impl::addRunnable(Runnable* runnable) {
void RunLoop::Impl::removeRunnable(Runnable* runnable) {
std::lock_guard<std::recursive_mutex> lock(mtx);
if (runnable->iter != runnables.end()) {
runnables.erase(runnable->iter);
runnable->iter = runnables.end();
if (runnable->iter == runnables.end()) {
return;
}
if (nextRunnable == runnable->iter) {
++nextRunnable;
}
runnables.erase(runnable->iter);
runnable->iter = runnables.end();
}
void RunLoop::Impl::initRunnable(Runnable* runnable) {
@@ -141,8 +147,8 @@ Milliseconds RunLoop::Impl::processRunnables() {
// O(N) but in the render thread where we get tons
// of messages, the size of the list is usually 1~2.
for (auto iter = runnables.begin(); iter != runnables.end();) {
Runnable* runnable = *(iter++);
for (nextRunnable = runnables.begin(); nextRunnable != runnables.end();) {
Runnable* runnable = *(nextRunnable++);
auto const dueTime = runnable->dueTime();
if (dueTime <= now) {