summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-12-01 11:53:43 +0100
committerGitHub <noreply@github.com>2019-12-01 11:53:43 +0100
commit52e3993eb0bc98b94c6d65e6901c38daae73b7fa (patch)
tree5807357e07ebaa107861a1a270aa169e4d8577cb
parentea7f3037da441affca86f918209750a2c8a71cda (diff)
parent85a955fc5659f047dcc8fff6629f33a75dabaee9 (diff)
Merge pull request #33994 from nekomatata/start-fail-errors
Flush remaining messages before quitting the game when loading fails
-rw-r--r--main/main.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 22a31d597e..e6fba3c7b4 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -2090,6 +2090,11 @@ void Main::cleanup() {
ERR_FAIL_COND(!_start_success);
+ if (script_debugger) {
+ // Flush any remaining messages
+ script_debugger->idle_poll();
+ }
+
ResourceLoader::remove_custom_loaders();
ResourceSaver::remove_custom_savers();