1 files changed, 10 insertions, 0 deletions
diff --git a/core/message_queue.cpp b/core/message_queue.cpp
index 7c3bdfec53..c57bd4081c 100644
--- a/core/message_queue.cpp
+++ b/core/message_queue.cpp
@@ -271,6 +271,9 @@ void MessageQueue::flush() {
 	//using reverse locking strategy
 	_THREAD_SAFE_LOCK_
 
+	ERR_FAIL_COND(flushing); //already flushing, you did something odd
+	flushing = true;
+
 	while (read_pos < buffer_end) {
 
 		//lock on each iteration, so a call can re-add itself to the message queue
@@ -327,13 +330,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;