test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-12-10 08:07:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix Looper::removeMessage

Browse Source
This commit is contained in:
侯歌 2024-05-07 17:24:36 +08:00
parent 0d3f89a106
commit a8f145cfba
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/core/looper.cc
View File

@ -640,7 +640,7 @@ void Looper::addEventHandler(const EventHandler*handler){
}
void Looper::removeEventHandler(const EventHandler*handler){
for(auto it=mEventHandlers.begin();it!=mEventHandlers.end();it++){
for(auto it = mEventHandlers.begin();it != mEventHandlers.end();it++){
if((*it)==handler){
(*it)->mFlags |=1;//set removed flags
if((handler->mFlags&2)==0)//handler is not owned by looper,erase at once
@ -655,9 +655,11 @@ void Looper::removeMessages(const MessageHandler* handler) {
{ // acquire lock
std::lock_guard<std::recursive_mutex> _l(mLock);
for( auto it=mMessageEnvelopes.begin();it!=mMessageEnvelopes.end();it++){
if(it->handler==handler)
it=mMessageEnvelopes.erase(it);
for( auto it = mMessageEnvelopes.begin();it != mMessageEnvelopes.end();){
if(it->handler==handler){
it = mMessageEnvelopes.erase(it);
continue;
}it++;
}
} // release lock
}
@ -667,20 +669,22 @@ void Looper::removeMessages(const MessageHandler* handler, int what) {
{ // acquire lock
std::lock_guard<std::recursive_mutex> _l(mLock);
for( auto it=mMessageEnvelopes.begin();it!=mMessageEnvelopes.end();it++){
for( auto it = mMessageEnvelopes.begin();it != mMessageEnvelopes.end();){
if((it->handler==handler) && (it->message.what==what)){
it=mMessageEnvelopes.erase(it);
}
it = mMessageEnvelopes.erase(it);
continue;
}it++;
}
} // release lock
}
void Looper::removeCallbacks(const MessageHandler* handler,Runnable r){
std::lock_guard<std::recursive_mutex> _l(mLock);
for( auto it = mMessageEnvelopes.begin();it != mMessageEnvelopes.end();it++){
for( auto it = mMessageEnvelopes.begin();it != mMessageEnvelopes.end();){
if((it->handler==handler) && (it->message.callback==r)){
it = mMessageEnvelopes.erase(it);
}
continue;
}it++;
}
}