From 3aa92c8f059c86f31fbec72e64ac1f7f9561dcb3 Mon Sep 17 00:00:00 2001
From: Matthew Penner <me@matthewp.io>
Date: Wed, 13 May 2020 15:38:07 -0600
Subject: [PATCH] Only add the guild to SessionErrors if the error is not nil

---
 voice/voice.go | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/voice/voice.go b/voice/voice.go
index be2b82e..a0ec3ce 100644
--- a/voice/voice.go
+++ b/voice/voice.go
@@ -149,15 +149,7 @@ func (e *CloseError) HasError() bool {
 		return true
 	}
 
-	for _, err := range e.SessionErrors {
-		if err == nil {
-			continue
-		}
-
-		return true
-	}
-
-	return false
+	return len(e.SessionErrors) > 0
 }
 
 func (e *CloseError) Error() string {
@@ -165,20 +157,11 @@ func (e *CloseError) Error() string {
 		return e.StateErr.Error()
 	}
 
-	var errorCount int
-	for _, err := range e.SessionErrors {
-		if err == nil {
-			continue
-		}
-
-		errorCount++
-	}
-
-	if errorCount < 1 {
+	if len(e.SessionErrors) < 1 {
 		return ""
 	}
 
-	return strconv.Itoa(errorCount) + " voice sessions returned errors while attempting to disconnect"
+	return strconv.Itoa(len(e.SessionErrors)) + " voice sessions returned errors while attempting to disconnect"
 }
 
 func (v *Voice) Close() error {
@@ -190,7 +173,9 @@ func (v *Voice) Close() error {
 	defer v.mapmutex.Unlock()
 
 	for gID, s := range v.sessions {
-		err.SessionErrors[gID] = s.Disconnect()
+		if dErr := s.Disconnect(); dErr != nil {
+			err.SessionErrors[gID] = dErr
+		}
 	}
 
 	err.StateErr = v.State.Close()