From 99de53264ede418d87bd0611490ec3c22809189f Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Wed, 22 May 2019 20:29:19 -0400 Subject: [PATCH] fix a bug in SetQuitMessage Quit messages aren't supposed to clobber each other under any circumstances, but actually only the default "Connection closed" message was non-clobbering, all others would clobber. --- irc/client.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/irc/client.go b/irc/client.go index 11860c9d..be6366da 100644 --- a/irc/client.go +++ b/irc/client.go @@ -121,15 +121,13 @@ type Session struct { // sets the session quit message, if there isn't one already func (sd *Session) SetQuitMessage(message string) (set bool) { if message == "" { - if sd.quitMessage == "" { - sd.quitMessage = "Connection closed" - return true - } else { - return false - } - } else { + message = "Connection closed" + } + if sd.quitMessage == "" { sd.quitMessage = message return true + } else { + return false } }