Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-11-22 00:48:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better solution for the previous fix.

Browse Source
This commit is contained in:
Relintai 2024-11-14 01:06:33 +01:00
parent 78534d1564
commit d75d3591ed
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/string/ustring.cpp
View File

@ -5161,6 +5161,10 @@ String::String(const CharType *p_str) {
copy_from(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) { String::String(const char *p_str, int p_clip_to_len) {
copy_from(p_str, p_clip_to_len); copy_from(p_str, p_clip_to_len);
} }

1
core/string/ustring.h
View File

@ -569,6 +569,7 @@ public:
String(const char *p_str); String(const char *p_str);
String(const wchar_t *p_str); String(const wchar_t *p_str);
String(const CharType *p_str); String(const CharType *p_str);
String(const Char16String &p_str);
String(const char *p_str, int p_clip_to_len); String(const char *p_str, int p_clip_to_len);
String(const wchar_t *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); String(const CharType *p_str, int p_clip_to_len);

2
platform/windows/os_windows.cpp
View File

@ -2983,7 +2983,7 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments,
CloseHandle(pipe[1]); 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 (p_blocking) {
if (r_pipe) { if (r_pipe) {