JNA/Jansi isWindowsConsole() method return true only if both input an…

…d output streams are connected to a terminal
jline · Nov 5, 2020 · 1c9f16d · 1c9f16d
1 parent 542bfb6
commit 1c9f16d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java
@@ -80,9 +80,10 @@ public static JansiWinSysTerminal createTerminal(String name, String type, boole
     }
 
     public static boolean isWindowsConsole() {
-        long console = GetStdHandle(STD_OUTPUT_HANDLE);
+        long consoleOut = GetStdHandle(STD_OUTPUT_HANDLE);
+        long consoleIn = GetStdHandle(STD_INPUT_HANDLE);
         int[] mode = new int[1];
-        return Kernel32.GetConsoleMode(console, mode) == 0;
+        return Kernel32.GetConsoleMode(consoleOut, mode) != 0 && Kernel32.GetConsoleMode(consoleIn, mode) != 0;
     }
 
     JansiWinSysTerminal(Writer writer, String name, String type, Charset encoding, int codepage, boolean nativeSignals, SignalHandler signalHandler) throws IOException {

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java
@@ -70,6 +70,7 @@ public static boolean isWindowsConsole() {
         try {
             IntByReference mode = new IntByReference();
             Kernel32.INSTANCE.GetConsoleMode(consoleOut, mode);
+            Kernel32.INSTANCE.GetConsoleMode(consoleIn, mode);
             return true;
         } catch (LastErrorException e) {
             return false;