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

Remove confusing USER prefix from script-logged errors

3 files changed, 3 insertions, 17 deletions

diff --git a/core/io/logger.cpp b/core/io/logger.cpp
index a24277fe72..26b60f6738 100644
--- a/core/io/logger.cpp
+++ b/core/io/logger.cpp
@@ -84,11 +84,7 @@ void Logger::log_error(const char *p_function, const char *p_file, int p_line, c
 		err_details = p_code;
 	}
 
-	if (p_editor_notify) {
-		logf_error("%s: %s\n", err_type, err_details);
-	} else {
-		logf_error("USER %s: %s\n", err_type, err_details);
-	}
+	logf_error("%s: %s\n", err_type, err_details);
 	logf_error("   at: %s (%s:%i)\n", p_function, p_file, p_line);
 }
 
diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp
index baa44f56c4..2c30cb8265 100644
--- a/editor/editor_log.cpp
+++ b/editor/editor_log.cpp
@@ -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);
 	}
 
-	if (p_editor_notify) {
-		err_str += " (User)";
-	}
-
 	MessageType message_type = p_type == ERR_HANDLER_WARNING ? MSG_TYPE_WARNING : MSG_TYPE_ERROR;
 
 	if (!Thread::is_main_thread()) {
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 40b265785f..fb95c69b52 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -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) {
 	String err_str;
 	if (p_errorexp && p_errorexp[0]) {
-		err_str = String::utf8(p_errorexp);
+		err_str = String::utf8(p_errorexp) + "\n";
 	} else {
-		err_str = String::utf8(p_file) + ":" + itos(p_line) + " - " + String::utf8(p_error);
-	}
-
-	if (p_editor_notify) {
-		err_str += " (User)\n";
-	} else {
-		err_str += "\n";
+		err_str = String::utf8(p_file) + ":" + itos(p_line) + " - " + String::utf8(p_error) + "\n";
 	}
 
 	OutputDebugStringW((LPCWSTR)err_str.utf16().ptr());