fixes #480 EventError fired after suspended Screen resumes

gdamore · Sep 4, 2021 · 01188f4 · 01188f4
1 parent 7c71e4f
commit 01188f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/tscreen.go b/tscreen.go
@@ -1547,7 +1547,12 @@ func (t *tScreen) inputLoop(stopQ chan struct{}) {
 		switch e {
 		case nil:
 		default:
-			_ = t.PostEvent(NewEventError(e))
+			t.Lock()
+			running := t.running
+			t.Unlock()
+			if running {
+				_ = t.PostEvent(NewEventError(e))
+			}
 			return
 		}
 		if n > 0 {

diff --git a/tty_unix.go b/tty_unix.go
@@ -72,7 +72,7 @@ func (tty *devTty) Start() error {
 	if tty.f, err = os.OpenFile(tty.dev, os.O_RDWR, 0); err != nil {
 		return err
 	}
-	tty.fd = int(tty.of.Fd())
+	tty.fd = int(tty.f.Fd())
 
 	if !term.IsTerminal(tty.fd) {
 		return errors.New("device is not a terminal")