summaryrefslogtreecommitdiff
path: root/main/main.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-06-30 11:59:33 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-06-30 11:59:33 -0300
commitb4d5f7e154973e8fb93a9a0af6ffa0b065e2c50c (patch)
tree67551f833464dc31c7d48e68e93b68c161e404b2 /main/main.cpp
parent4613a3f2c0d8f060cac610e2a7a401aee2ece78f (diff)
parent55b34e05b3d735a84e1af9833e19c0b816c18252 (diff)
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'main/main.cpp')
-rw-r--r--main/main.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp
index f68bde003e..4cf4f3c7cd 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -605,6 +605,9 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
if (bool(Globals::get_singleton()->get("application/disable_stdout"))) {
quiet_stdout=true;
}
+ if (bool(Globals::get_singleton()->get("application/disable_stderr"))) {
+ _print_error_enabled = false;
+ };
if (quiet_stdout)
_print_line_enabled=false;