summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorBernhard Liebl <Bernhard.Liebl@gmx.org>2018-03-15 12:22:10 +0100
committerBernhard Liebl <Bernhard.Liebl@gmx.org>2018-03-15 12:22:10 +0100
commit2b728de8f2a7a79dc150b3ed7a03428c92136ad4 (patch)
tree87ef33020c48794f5b677d8e611ca64fed7ad339 /main
parent506c4926577910230eceecd07df3cc42e423d25f (diff)
Fix debugger_stdout_settings being ignored
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 82b79cd9a2..f0b8fea206 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -689,6 +689,19 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
I = N;
}
+ if (globals->setup(game_path, main_pack, upwards) == OK) {
+ found_project = true;
+ } else {
+
+#ifdef TOOLS_ENABLED
+ editor = false;
+#else
+ OS::get_singleton()->print("Error: Could not load game path '%s'.\n", game_path.ascii().get_data());
+
+ goto error;
+#endif
+ }
+
GLOBAL_DEF("memory/limits/multithreaded_server/rid_pool_prealloc", 60);
GLOBAL_DEF("network/limits/debugger_stdout/max_chars_per_second", 2048);
GLOBAL_DEF("network/limits/debugger_stdout/max_messages_per_frame", 10);
@@ -761,19 +774,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
#endif
- if (globals->setup(game_path, main_pack, upwards) == OK) {
- found_project = true;
- } else {
-
-#ifdef TOOLS_ENABLED
- editor = false;
-#else
- OS::get_singleton()->print("Error: Could not load game path '%s'.\n", game_path.ascii().get_data());
-
- goto error;
-#endif
- }
-
GLOBAL_DEF("logging/file_logging/enable_file_logging", false);
GLOBAL_DEF("logging/file_logging/log_path", "user://logs/log.txt");
GLOBAL_DEF("logging/file_logging/max_log_files", 10);