Bladeren bron

Windows: Restore console mode on set mode failure

SetConsoleMode() on input handles appears to remember invalid bits that
were set, causing problems for other programs (such as xcopy.exe) trying
to set the console mode after docker.exe has exited. Always restore
the input console mode on set failure.

Signed-off-by: John Starks <jostarks@microsoft.com>
John Starks 9 jaren geleden
bovenliggende
commit
83c186fdd4
1 gewijzigde bestanden met toevoegingen van 3 en 1 verwijderingen
  1. 3 1
      pkg/term/term_windows.go

+ 3 - 1
pkg/term/term_windows.go

@@ -44,9 +44,11 @@ func StdStreams() (stdIn io.ReadCloser, stdOut, stdErr io.Writer) {
 		if err = winterm.SetConsoleMode(fd, mode|enableVirtualTerminalInput); err != nil {
 		if err = winterm.SetConsoleMode(fd, mode|enableVirtualTerminalInput); err != nil {
 			emulateStdin = true
 			emulateStdin = true
 		} else {
 		} else {
-			winterm.SetConsoleMode(fd, mode)
 			vtInputSupported = true
 			vtInputSupported = true
 		}
 		}
+		// Unconditionally set the console mode back even on failure because SetConsoleMode
+		// remembers invalid bits on input handles.
+		winterm.SetConsoleMode(fd, mode)
 	}
 	}
 
 
 	fd = os.Stdout.Fd()
 	fd = os.Stdout.Fd()