From bec892c010a18d15a7b6cc28a7857d1e5edfd8d3 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Fri, 10 Jun 2022 18:31:40 +0200 Subject: [PATCH] Tweak default crash handler message in exported projects When an exported project crashes, the crash handler message shouldn't reference the Godot issue tracker, as not all crashes are Godot's fault. Reporting crashes that only occur on exported projects is still allowed, but it should not be done by people who aren't working on the project in question. (cherry picked from commit c850ccb7c084e84b536c6fa5f0c667ed49c27cf4) --- doc/classes/ProjectSettings.xml | 7 +++++-- main/main.cpp | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index 2448ad2b83d..649d8b80289 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -402,8 +402,11 @@ If [code]true[/code], enables warnings when assigning the result of a function that returns [code]void[/code] to a variable. - - Message to be displayed before the backtrace when the engine crashes. + + Message to be displayed before the backtrace when the engine crashes. By default, this message is only used in exported projects due to the editor-only override applied to this setting. + + + Editor-only override for [member debug/settings/crash_handler/message]. Does not affect exported projects in debug or release mode. Maximum number of frames per second allowed. The actual number of frames per second may still be below this value if the game is lagging. See also [member physics/common/physics_fps]. diff --git a/main/main.cpp b/main/main.cpp index 45afa13d4d5..35edf8e214a 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -411,7 +411,10 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph ClassDB::register_class(); engine->add_singleton(Engine::Singleton("Performance", performance)); - GLOBAL_DEF("debug/settings/crash_handler/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 to the project developer.")); + GLOBAL_DEF("debug/settings/crash_handler/message.editor", + String("Please include this when reporting the bug on: https://github.com/godotengine/godot/issues")); MAIN_PRINT("Main: Parse CMDLine");