summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-04-05 16:56:29 +0200
committerGitHub <noreply@github.com>2019-04-05 16:56:29 +0200
commit03bd93e3b3e4602a7cdc475f106ba3a85a9cd8ce (patch)
tree8b79be3c192fd84e8f199cf6f46d8e63d248fe2a
parent50ef456c7847d8119a4b9ecc7a1193ae4773da80 (diff)
parent3c27980a178ce26e584b36ea4bf2fc3f661c903b (diff)
Merge pull request #26830 from KidRigger/physics_fps_bug
Fixes physic_fps=0 bug that prevented quit.
-rw-r--r--main/main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 0871b12338..fc9ec3b2d9 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1882,7 +1882,9 @@ bool Main::iteration() {
uint64_t idle_begin = OS::get_singleton()->get_ticks_usec();
- OS::get_singleton()->get_main_loop()->idle(step * time_scale);
+ if (OS::get_singleton()->get_main_loop()->idle(step * time_scale)) {
+ exit = true;
+ }
message_queue->flush();
VisualServer::get_singleton()->sync(); //sync if still drawing from previous frames.