Merge pull request #26462 from SubSage/master

Fixes OS.execute; stderr was silenced; adds missing quote from exe args (windows)
2019-05-28 14:26:57 +02:00
parent 235172e26b 9e465c9fd0
commit 06633a8074
3 changed files with 11 additions and 5 deletions
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@ -2475,7 +2475,13 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments,

 		for (const List<String>::Element *E = p_arguments.front(); E; E = E->next()) {

-			argss += String(" \"") + E->get() + "\"";
+			argss += " \"" + E->get() + "\"";
+		}
+
+		argss += "\"";
+
+		if (read_stderr) {
+			argss += " 2>&1"; // Read stderr too
 		}

 		FILE *f = _wpopen(argss.c_str(), L"r");