From d5be77075a6e3dbc8ea167d4c5ab60663b0dbe68 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Tue, 29 Jan 2013 15:37:54 -0800 Subject: [PATCH] Fix a bug which caused the client to never exit in interactive mode when NORAW is set. --- docker/docker.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/docker.go b/docker/docker.go index f42d1ff4e2..3c3da5e378 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -185,9 +185,10 @@ func main() { if err := <-receive_stdout; err != nil { Fatal(err) } - if IsTerminal(0) && os.Getenv("NORAW") == "" { + if oldState != nil { Restore(0, oldState) - } else { + } + if !IsTerminal(0) { if err := <-send_stdin; err != nil { Fatal(err) }