diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-04 08:16:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 08:16:26 +0100 |
| commit | f09fd9dc6e70d2ece2e6c5dc795ac4d3524439aa (patch) | |
| tree | 9a5da3a9cc6a39d1678abb7dae76e880c7574605 | |
| parent | 80582ffa662bb4dea223003856320ede37365603 (diff) | |
| parent | 8a88637705ecf58a069b3ea631fee8501fd8e6f4 (diff) | |
Merge pull request #36777 from kuruk-mm/os_getsystemdir
os: execute parse the command output from utf8
| -rw-r--r-- | drivers/unix/os_unix.cpp | 2 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 1d94b9618d..27203b3eed 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -307,7 +307,7 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bo if (p_pipe_mutex) { p_pipe_mutex->lock(); } - (*r_pipe) += buf; + (*r_pipe) += String::utf8(buf); if (p_pipe_mutex) { p_pipe_mutex->unlock(); } diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 7f4392c624..6757f60a06 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -2724,7 +2724,7 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments, if (p_pipe_mutex) { p_pipe_mutex->lock(); } - (*r_pipe) += buf; + (*r_pipe) += String::utf8(buf); if (p_pipe_mutex) { p_pipe_mutex->unlock(); } |