diff options
author | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2015-10-04 14:36:58 -0700 |
---|---|---|
committer | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2015-10-04 14:36:58 -0700 |
commit | 98de173de9d694de28aea0c94c7c150ed75fb744 (patch) | |
tree | 80357bcf6791e8dc66c587a1df0be2e27aaf1a74 /src/core/basetypes/MCObject.cpp | |
parent | 4491af22e19513f0c31662cfa70bf899ebdb3a15 (diff) |
release objects earlier when timer is cancelled
Diffstat (limited to 'src/core/basetypes/MCObject.cpp')
-rw-r--r-- | src/core/basetypes/MCObject.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/basetypes/MCObject.cpp b/src/core/basetypes/MCObject.cpp index bbcddb2f..6f776ef6 100644 --- a/src/core/basetypes/MCObject.cpp +++ b/src/core/basetypes/MCObject.cpp @@ -181,7 +181,7 @@ static void removeFromPerformHash(Object * obj, Object::Method method, void * co keyData.method = method; key.data = &keyData; key.len = sizeof(keyData); - + pthread_mutex_lock(&delayedPerformLock); chash_delete(delayedPerformHash, (chashdatum *) &key, NULL); pthread_mutex_unlock(&delayedPerformLock); @@ -360,7 +360,9 @@ void Object::performMethodOnDispatchQueueAfterDelay(Method method, void * contex } dupCancelableBlock(false); Block_release(dupCancelableBlock); - release(); + if (!cancelled) { + release(); + } }); } @@ -373,6 +375,7 @@ void Object::cancelDelayedPerformMethodOnDispatchQueue(Method method, void * con } removeFromPerformHash(this, method, context, targetDispatchQueue); dupCancelableBlock(true); + release(); } #endif |