summaryrefslogtreecommitdiff
path: root/main/main.cpp
diff options
context:
space:
mode:
authorHein-Pieter van Braam <hp@tmm.cx>2017-09-19 11:16:47 +0200
committerGitHub <noreply@github.com>2017-09-19 11:16:47 +0200
commit24c76f177e5702844cabef98f87ded9aa89a67e6 (patch)
tree19d15b364137f8bd31cd74bf02318916502d2a68 /main/main.cpp
parent3d06957f12ba5c04702f3db980af9c07142e7886 (diff)
parentff1e0a3e2cb6619644215432604293eb7ba53699 (diff)
Merge pull request #11395 from marcelofg55/fix_crashhandler_win
Prevent running the crash_handler when a debugger is present on windows
Diffstat (limited to 'main/main.cpp')
-rw-r--r--main/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index bb601198db..04375666a9 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -248,7 +248,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
performance = memnew(Performance);
globals->add_singleton(ProjectSettings::Singleton("Performance", performance));
- GLOBAL_DEF("debug/settings/backtrace/message", String("Please include this when reporting the bug on https://github.com/godotengine/godot/issues"));
+ GLOBAL_DEF("debug/settings/crash_handler/message", String("Please include this when reporting the bug on https://github.com/godotengine/godot/issues"));
MAIN_PRINT("Main: Parse CMDLine");