aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Viktor Gedzenko <foxinushka@gmail.com>2014-09-23 14:42:26 +0300
committerGravatar Viktor Gedzenko <foxinushka@gmail.com>2014-09-23 14:42:26 +0300
commitf42c7b9805d3c6f688cbe3d46088d2c67989b80f (patch)
tree7cafa38977257f3208f9e116b74d2f5110ba0b3a /src
parentf8ae9bfe4dc6517c7fbdbe03650abab789cae9e6 (diff)
Fixed thread safety in OperationQueue
Diffstat (limited to 'src')
-rw-r--r--src/core/basetypes/MCOperationQueue.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/basetypes/MCOperationQueue.cc b/src/core/basetypes/MCOperationQueue.cc
index e45f04ee..a2554ab5 100644
--- a/src/core/basetypes/MCOperationQueue.cc
+++ b/src/core/basetypes/MCOperationQueue.cc
@@ -178,11 +178,21 @@ void OperationQueue::checkRunningOnMainThread(void * context)
{
retain(); // (4)
if (_pendingCheckRunning) {
+#if __APPLE__
+ cancelDelayedPerformMethodOnDispatchQueue((Object::Method) &OperationQueue::checkRunningAfterDelay, NULL, mDispatchQueue);
+#else
cancelDelayedPerformMethod((Object::Method) &OperationQueue::checkRunningAfterDelay, NULL);
+#endif
release(); // (4)
}
_pendingCheckRunning = true;
+
+#if __APPLE__
+ performMethodOnDispatchQueueAfterDelay((Object::Method) &OperationQueue::checkRunningAfterDelay, NULL, mDispatchQueue, 1);
+#else
performMethodAfterDelay((Object::Method) &OperationQueue::checkRunningAfterDelay, NULL, 1);
+#endif
+
release(); // (1)
}