From 23b4656fc573dcecd8bdce9c0235249e73d384f4 Mon Sep 17 00:00:00 2001
From: Don2Quixote <idonquixote@yandex.ru>
Date: Sat, 7 Aug 2021 23:07:42 +0300
Subject: [PATCH] Made error check conditions clearer

---
 tx.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tx.go b/tx.go
index 7a296f4f..973f2b8e 100644
--- a/tx.go
+++ b/tx.go
@@ -109,7 +109,7 @@ func (c *Conn) BeginTxFunc(ctx context.Context, txOptions TxOptions, f func(Tx)
 	}
 	defer func() {
 		rollbackErr := tx.Rollback(ctx)
-		if !(rollbackErr == nil || errors.Is(rollbackErr, ErrTxClosed)) {
+		if rollbackErr != nil && !errors.Is(rollbackErr, ErrTxClosed) {
 			err = rollbackErr
 		}
 	}()
@@ -203,7 +203,7 @@ func (tx *dbTx) BeginFunc(ctx context.Context, f func(Tx) error) (err error) {
 	}
 	defer func() {
 		rollbackErr := savepoint.Rollback(ctx)
-		if !(rollbackErr == nil || errors.Is(rollbackErr, ErrTxClosed)) {
+		if rollbackErr != nil && !errors.Is(rollbackErr, ErrTxClosed) {
 			err = rollbackErr
 		}
 	}()