From d6c94fd5270beaf892987fb40723f7bfe82641e7 Mon Sep 17 00:00:00 2001 From: "Mateo Dev .59" Date: Wed, 19 Feb 2020 15:59:37 -0300 Subject: [PATCH] os: execute parse the command output from utf8 (cherry picked from commit 8a88637705ecf58a069b3ea631fee8501fd8e6f4) --- drivers/unix/os_unix.cpp | 2 +- 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 c5eb343cc84..9a535c4f2eb 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -310,7 +310,7 @@ Error OS_Unix::execute(const String &p_path, const List &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 a6977a7a86d..118deb90584 100755 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -2713,7 +2713,7 @@ Error OS_Windows::execute(const String &p_path, const List &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(); }