Fix error logic

MouseHatGames · Mar 17, 2021 · cd73962 · cd73962
1 parent 428d163
commit cd73962
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/errors/error.go b/errors/error.go
@@ -41,21 +41,21 @@ func (e *Error) Encode() (string, error) {
 }
 
 // Decode tries to decode en error from a base64-encoded string
-func Decode(str string) (*Error, error) {
+func Decode(str string) (*Error, bool) {
 	bdec, err := base64.StdEncoding.DecodeString(str)
 	if err != nil {
-		return nil, err
+		return nil, false
 	}
 
 	b := bytes.NewReader(bdec)
 	dec := gob.NewDecoder(b)
 
 	var merr Error
 	if err := dec.Decode(&merr); err != nil {
-		return nil, err
+		return nil, false
 	}
 
-	return &merr, nil
+	return &merr, true
 }
 
 func (e *Error) Error() string {

diff --git a/transport/message.go b/transport/message.go
@@ -41,7 +41,7 @@ func (m *Message) GetError() (err error, hasError bool) {
 		return nil, false
 	}
 
-	if merr, err := errors.Decode(value); err != nil {
+	if merr, ok := errors.Decode(value); ok {
 		return merr, true
 	}