diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-09-13 18:05:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 18:05:31 +0200 |
| commit | d6b392825fc3e22d9e0c62f0d17633c4224eb28f (patch) | |
| tree | 5c9bc70e0a9ad094fb22398d9ba6e57bc09aba85 /editor | |
| parent | 322b0bee4967545383fba8a2c9b1253e2a2bbf43 (diff) | |
| parent | 83fe9373621ab9f7e175a43868b2eda935107539 (diff) | |
Merge pull request #11061 from marcelofg55/dump_backtrace
Add a segfault handler to dump the backtrace on Windows, Linux and OS X
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_run.cpp | 4 | ||||
| -rw-r--r-- | editor/project_manager.cpp | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index e377fa1a8e..90cbabcc4f 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -72,6 +72,10 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li screen--; } + if (OS::get_singleton()->is_disable_crash_handler()) { + args.push_back("--disable-crash-handler"); + } + Rect2 screen_rect; screen_rect.position = OS::get_singleton()->get_screen_position(screen); screen_rect.size = OS::get_singleton()->get_screen_size(screen); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index b36d4715c4..cca5e1f6a0 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -948,6 +948,10 @@ void ProjectManager::_open_project_confirm() { args.push_back("--editor"); + if (OS::get_singleton()->is_disable_crash_handler()) { + args.push_back("--disable-crash-handler"); + } + String exec = OS::get_singleton()->get_executable_path(); OS::ProcessID pid = 0; @@ -999,6 +1003,10 @@ void ProjectManager::_run_project_confirm() { args.push_back("--path"); args.push_back(path); + if (OS::get_singleton()->is_disable_crash_handler()) { + args.push_back("--disable-crash-handler"); + } + String exec = OS::get_singleton()->get_executable_path(); OS::ProcessID pid = 0; |