From 4bb0080b3df28a3003bfffd6285602664a4279c9 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 14 Jan 2019 10:59:28 -0300 Subject: Do not allow adding tasks while in the middle of flushing a message queue --- core/message_queue.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'core/message_queue.cpp') diff --git a/core/message_queue.cpp b/core/message_queue.cpp index 7c3bdfec53..27da2c099a 100644 --- a/core/message_queue.cpp +++ b/core/message_queue.cpp @@ -271,6 +271,8 @@ void MessageQueue::flush() { //using reverse locking strategy _THREAD_SAFE_LOCK_ + flushing = true; + while (read_pos < buffer_end) { //lock on each iteration, so a call can re-add itself to the message queue @@ -327,13 +329,20 @@ void MessageQueue::flush() { } buffer_end = 0; // reset buffer + flushing = false; _THREAD_SAFE_UNLOCK_ } +bool MessageQueue::is_flushing() const { + + return flushing; +} + MessageQueue::MessageQueue() { ERR_FAIL_COND(singleton != NULL); singleton = this; + flushing = false; buffer_end = 0; buffer_max_used = 0; -- cgit v1.2.3