summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2019-01-24 12:42:05 -0300
committerJuan Linietsky <reduzio@gmail.com>2019-01-24 12:42:57 -0300
commit99d997e424ad1d2f96044d4903caf8dd7347fbf5 (patch)
treec54f94b27b3d6f5499b829b8165ab2beb438d83e
parent148e62102bcb7051d8175aa7c9eec8a41b066fdb (diff)
Do not fail on recursive iteration. Not ideal but should work for now and not crash. Fixes #25272
Eventually some sort of main even queue should be implemented to do this properly.
-rw-r--r--main/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index b94130002d..211c3b69da 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1800,7 +1800,8 @@ static uint64_t idle_process_max = 0;
bool Main::iteration() {
- ERR_FAIL_COND_V(iterating, false);
+ //for now do not error on this
+ //ERR_FAIL_COND_V(iterating, false);
iterating = true;