godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96168 from CreatedBySeb/remove-user-prefix 

Remove confusing USER prefix from script-logged errors
This commit is contained in:
Rémi Verschelde 2024-08-27 17:52:40 +02:00
parent ae241abde7 c3ed8a842c
commit 431c5839fe
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/io/logger.cpp
View File

@ -84,11 +84,7 @@ void Logger::log_error(const char *p_function, const char *p_file, int p_line, c
err_details = p_code; err_details = p_code;
} }
if (p_editor_notify) { logf_error("%s: %s\n", err_type, err_details);
logf_error("%s: %s\n", err_type, err_details);
} else {
logf_error("USER %s: %s\n", err_type, err_details);
}
logf_error(" at: %s (%s:%i)\n", p_function, p_file, p_line); logf_error(" at: %s (%s:%i)\n", p_function, p_file, p_line);
} }

4
editor/editor_log.cpp
View File

@ -52,10 +52,6 @@ void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_f
err_str = String::utf8(p_file) + ":" + itos(p_line) + " - " + String::utf8(p_error); err_str = String::utf8(p_file) + ":" + itos(p_line) + " - " + String::utf8(p_error);
} }
if (p_editor_notify) {
err_str += " (User)";
}
MessageType message_type = p_type == ERR_HANDLER_WARNING ? MSG_TYPE_WARNING : MSG_TYPE_ERROR; MessageType message_type = p_type == ERR_HANDLER_WARNING ? MSG_TYPE_WARNING : MSG_TYPE_ERROR;
if (!Thread::is_main_thread()) { if (!Thread::is_main_thread()) {

10
platform/windows/os_windows.cpp
View File

@ -166,15 +166,9 @@ void OS_Windows::initialize_debugging() {
static void _error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, bool p_editor_notify, ErrorHandlerType p_type) { static void _error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, bool p_editor_notify, ErrorHandlerType p_type) {
String err_str; String err_str;
if (p_errorexp && p_errorexp[0]) { if (p_errorexp && p_errorexp[0]) {
err_str = String::utf8(p_errorexp); err_str = String::utf8(p_errorexp) + "\n";
} else { } else {
err_str = String::utf8(p_file) + ":" + itos(p_line) + " - " + String::utf8(p_error); err_str = String::utf8(p_file) + ":" + itos(p_line) + " - " + String::utf8(p_error) + "\n";
}
if (p_editor_notify) {
err_str += " (User)\n";
} else {
err_str += "\n";
} }
OutputDebugStringW((LPCWSTR)err_str.utf16().ptr()); OutputDebugStringW((LPCWSTR)err_str.utf16().ptr());