add check if stdin is using console before font check

PowerShell · Oct 4, 2018 · 2f4e5fa · 2f4e5fa
1 parent 015abde
commit 2f4e5fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/PSReadLine/PlatformWindows.cs b/PSReadLine/PlatformWindows.cs
@@ -368,6 +368,12 @@ private static bool SetConsoleOutputVirtualTerminalProcessing()
             && SetConsoleMode(handle, mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
     }
 
+    internal static bool IsConsoleInput()
+    {
+        var handle = GetStdHandle((uint)StandardHandleId.Input);
+        return GetFileType(handle) == FILE_TYPE_CHAR;
+    }
+
     private static bool IsHandleRedirected(bool stdin)
     {
         var handle = GetStdHandle((uint)(stdin ? StandardHandleId.Input : StandardHandleId.Output));

diff --git a/PSReadLine/ReadLine.cs b/PSReadLine/ReadLine.cs
@@ -654,7 +654,7 @@ private void Initialize(Runspace runspace, EngineIntrinsics engineIntrinsics)
 
             // Don't change the OutputEncoding if already UTF8 or using raster font on Windows
             _changeOutputEncoding = _initialOutputEncoding != Encoding.UTF8;
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && PlatformWindows.IsUsingRasterFont())
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && PlatformWindows.IsConsoleInput() && PlatformWindows.IsUsingRasterFont())
             {
                 _changeOutputEncoding = false;
             }