From dc6f2fb50c76700bba4f9d30a3f2b7db3765dcc8 Mon Sep 17 00:00:00 2001
From: s3lph <5564491+s3lph@users.noreply.github.com>
Date: Thu, 24 Sep 2020 04:03:14 +0200
Subject: [PATCH] Fix golangci-lint complaints, #2

---
 bridge/mumble/handlers.go | 8 ++++++--
 bridge/mumble/mumble.go   | 5 ++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bridge/mumble/handlers.go b/bridge/mumble/handlers.go
index 3cdadc49..34e17f2c 100644
--- a/bridge/mumble/handlers.go
+++ b/bridge/mumble/handlers.go
@@ -33,7 +33,9 @@ func (b *Bmumble) handleConnect(event *gumble.ConnectEvent) {
 	event.Client.Self.SetSelfMuted(true)
 	// if the Channel variable is set, this is a reconnect -> rejoin channel
 	if b.Channel != "" {
-		b.doJoin(event.Client, b.Channel)
+		if err := b.doJoin(event.Client, b.Channel); err != nil {
+			b.Log.Error(err)
+		}
 		b.Remote <- config.Message{
 			Username: "system",
 			Text:     "rejoin",
@@ -51,7 +53,9 @@ func (b *Bmumble) handleUserChange(event *gumble.UserChangeEvent) {
 	}
 	// Someone attempted to move the user out of the configured channel; attempt to join back
 	if b.Channel != "" && b.Channel != event.Client.Self.Channel.Name {
-		b.doJoin(event.Client, b.Channel)
+		if err := b.doJoin(event.Client, b.Channel); err != nil {
+			b.Log.Error(err)
+		}
 	}
 }
 
diff --git a/bridge/mumble/mumble.go b/bridge/mumble/mumble.go
index bc4ac10d..01db859a 100644
--- a/bridge/mumble/mumble.go
+++ b/bridge/mumble/mumble.go
@@ -71,14 +71,13 @@ func (b *Bmumble) Connect() error {
 }
 
 func (b *Bmumble) Disconnect() error {
-	b.client.Disconnect()
-	return nil
+	return b.client.Disconnect()
 }
 
 func (b *Bmumble) JoinChannel(channel config.ChannelInfo) error {
 	if b.Channel != "" && channel.Name != b.Channel {
 		b.Log.Fatalf("Cannot join channel '%s', already joined to channel '%s'", channel.Name, b.Channel)
-		return errors.New("The Mumble bridge can only join a single channel")
+		return errors.New("the Mumble bridge can only join a single channel")
 	}
 	b.Channel = channel.Name
 	return b.doJoin(b.client, channel.Name)