Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Henry <ludovic@xamarin.com>2015-10-16 13:00:58 +0300
committerLudovic Henry <ludovic@xamarin.com>2015-10-16 13:01:22 +0300
commit1720c3bacd96863d38731f9481ee253b0ad8349e (patch)
treecf2b6ec010f9daf41f95fbcd2ddcba499faa9c0a /mcs/class/System/System.Diagnostics
parent464ec0063eca24107826741c63ff08ac423433ab (diff)
Revert "[process] Use same behavior as .NET"
It broke the android build This reverts commit c688b8c84ca3b26a1025a2194314183d2a880086.
Diffstat (limited to 'mcs/class/System/System.Diagnostics')
-rw-r--r--mcs/class/System/System.Diagnostics/Process.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System/System.Diagnostics/Process.cs b/mcs/class/System/System.Diagnostics/Process.cs
index 97f8ae2463c..d9888b7e403 100644
--- a/mcs/class/System/System.Diagnostics/Process.cs
+++ b/mcs/class/System/System.Diagnostics/Process.cs
@@ -1100,7 +1100,7 @@ namespace System.Diagnostics {
if (startInfo.RedirectStandardOutput) {
MonoIO.Close (stdout_write, out error);
- Encoding stdoutEncoding = startInfo.StandardOutputEncoding ?? Console.OutputEncoding;
+ Encoding stdoutEncoding = startInfo.StandardOutputEncoding ?? Console.Out.Encoding;
process.output_stream = new StreamReader (new FileStream (new SafeFileHandle (stdout_read, false), FileAccess.Read, 8192, false), stdoutEncoding, true, 8192);
}
@@ -1108,7 +1108,7 @@ namespace System.Diagnostics {
if (startInfo.RedirectStandardError) {
MonoIO.Close (stderr_write, out error);
- Encoding stderrEncoding = startInfo.StandardErrorEncoding ?? Console.OutputEncoding;
+ Encoding stderrEncoding = startInfo.StandardErrorEncoding ?? Console.Out.Encoding;
process.error_stream = new StreamReader (new FileStream (new SafeFileHandle (stderr_read, false), FileAccess.Read, 8192, false), stderrEncoding, true, 8192);
}