Better solution for the previous fix.

Relintai · Nov 14, 2024 · d75d359 · d75d359
1 parent 78534d1
commit d75d359
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp
@@ -5161,6 +5161,10 @@ String::String(const CharType *p_str) {
 	copy_from(p_str);
 }
 
+String::String(const Char16String &p_str) {
+	copy_from(p_str.ptr());
+}
+
 String::String(const char *p_str, int p_clip_to_len) {
 	copy_from(p_str, p_clip_to_len);
 }

diff --git a/core/string/ustring.h b/core/string/ustring.h
@@ -569,6 +569,7 @@ class String {
 	String(const char *p_str);
 	String(const wchar_t *p_str);
 	String(const CharType *p_str);
+	String(const Char16String &p_str);
 	String(const char *p_str, int p_clip_to_len);
 	String(const wchar_t *p_str, int p_clip_to_len);
 	String(const CharType *p_str, int p_clip_to_len);

diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
@@ -2983,7 +2983,7 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments,
 		CloseHandle(pipe[1]);
 	}
 
-	ERR_FAIL_COND_V_MSG(ret == 0, ERR_CANT_FORK, "Could not create child process: " + String((wchar_t *) modstr.ptr()));
+	ERR_FAIL_COND_V_MSG(ret == 0, ERR_CANT_FORK, "Could not create child process: " + String(modstr));
 
 	if (p_blocking) {
 		if (r_pipe) {