From 5223c786e1ee8df8e35c7c90b4aaef168826d3fd Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Mon, 8 Jul 2019 15:35:34 +0200
Subject: [PATCH] some fixes

---
 pkg/commands/container.go   | 11 +++++++----
 pkg/gui/containers_panel.go |  4 +---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkg/commands/container.go b/pkg/commands/container.go
index 77d414ed..5a84593e 100644
--- a/pkg/commands/container.go
+++ b/pkg/commands/container.go
@@ -361,12 +361,14 @@ func (c *Container) Attach() error {
 		Stdin:  c.Details.Config.OpenStdin,
 		Stdout: true,
 		Stderr: true,
+		Logs:   true,
 	}
 
 	hijack, err := c.Client.ContainerAttach(context.Background(), c.ID, options)
 	if err != nil {
 		return err
 	}
+	defer hijack.Close()
 
 	if c.Details.Config.OpenStdin {
 		fd := int(os.Stdin.Fd())
@@ -388,18 +390,19 @@ func (c *Container) Attach() error {
 		return err
 	}
 
-	hijack.Close()
-
 	return nil
 }
 
 func (c *Container) resizeIfChanged(fd int) {
-	channel := make(chan os.Signal)
+	channel := make(chan os.Signal, 1)
 	signal.Notify(channel, syscall.SIGWINCH)
 
 	for {
 		<-channel
-		c.Resize(fd)
+		err := c.Resize(fd)
+		if err != nil {
+			return
+		}
 	}
 }
 
diff --git a/pkg/gui/containers_panel.go b/pkg/gui/containers_panel.go
index 6f397c72..8c078aad 100644
--- a/pkg/gui/containers_panel.go
+++ b/pkg/gui/containers_panel.go
@@ -472,9 +472,7 @@ func (gui *Gui) handleContainerAttach(g *gocui.Gui, v *gocui.View) error {
 		return gui.createErrorPanel(gui.g, err.Error())
 	}
 
-	gui.RunWithSubprocesses()
-
-	return gui.Errors.ErrSubProcess
+	return nil
 }
 
 func (gui *Gui) handlePruneContainers(g *gocui.Gui, v *gocui.View) error {