From 91b15d1a90bf735656c47d912955233c00187632 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 22 Aug 2022 15:07:27 +0530
Subject: [PATCH] Fix incorrect err handling

---
 tools/utils/tty.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/utils/tty.go b/tools/utils/tty.go
index 0bedfb737..df9884f83 100644
--- a/tools/utils/tty.go
+++ b/tools/utils/tty.go
@@ -88,8 +88,7 @@ func (self *Term) SetRawWhen(when uintptr) (err error) {
 	}
 	new_state := state
 	termios.Cfmakeraw(&new_state)
-	err = self.Tcsetattr(when, &new_state)
-	if err != nil {
+	if err = self.Tcsetattr(when, &new_state); err == nil {
 		self.states = append(self.states, state)
 	}
 	return
@@ -104,8 +103,7 @@ func (self *Term) PopStateWhen(when uintptr) (err error) {
 		return nil
 	}
 	idx := len(self.states) - 1
-	err = self.Tcsetattr(when, &self.states[idx])
-	if err != nil {
+	if err = self.Tcsetattr(when, &self.states[idx]); err == nil {
 		self.states = self.states[:idx]
 	}
 	return
@@ -156,8 +154,7 @@ func (self *Term) SetReadTimeout(d time.Duration) (err error) {
 	}
 	b := a
 	b.Cc[unix.VMIN], b.Cc[unix.VTIME] = get_vmin_and_vtime(d)
-	err = self.Tcsetattr(termios.TCSANOW, &b)
-	if err != nil {
+	if err = self.Tcsetattr(termios.TCSANOW, &b); err == nil {
 		self.states = append(self.states, a)
 	}
 	return