summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-08-02 15:54:18 +0200
committerGitHub <noreply@github.com>2022-08-02 15:54:18 +0200
commit33258d850cf6b40d9b20ba9643f98b3553c392c4 (patch)
treecb918e8226e14369c0ab37cf9969ab206ed747b2 /main
parent4f8d31fc68c1b2276cbcbb62a308d59313b9fac6 (diff)
parentb221eab4260c471c37ff2aae2546fcfa6dd7ac58 (diff)
Merge pull request #61315 from lawnjelly/variant_bucket_pools
Variant memory pools
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 190f25dbe6..fe510d1c9c 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -31,6 +31,7 @@
#include "main.h"
#include "core/config/project_settings.h"
+#include "core/core_globals.h"
#include "core/core_string_names.h"
#include "core/crypto/crypto.h"
#include "core/debugger/engine_debugger.h"
@@ -1375,11 +1376,11 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
quiet_stdout = true;
}
if (bool(ProjectSettings::get_singleton()->get("application/run/disable_stderr"))) {
- _print_error_enabled = false;
+ CoreGlobals::print_error_enabled = false;
};
if (quiet_stdout) {
- _print_line_enabled = false;
+ CoreGlobals::print_line_enabled = false;
}
Logger::set_flush_stdout_on_print(ProjectSettings::get_singleton()->get("application/run/flush_stdout_on_print"));