From 24c103da5a3a6d54dc12a0f8a630f646d54c3279 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Sat, 5 Oct 2019 23:50:11 -0400
Subject: [PATCH] fix #642

---
 irc/client.go    | 2 +-
 irc/idletimer.go | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/irc/client.go b/irc/client.go
index 1f81bf6f..3b425287 100644
--- a/irc/client.go
+++ b/irc/client.go
@@ -1097,7 +1097,7 @@ func (client *Client) destroy(session *Session) {
 
 	// this happens under failure to return from BRB
 	if quitMessage == "" {
-		if !brbAt.IsZero() {
+		if brbState == BrbDead && !brbAt.IsZero() {
 			awayMessage := client.AwayMessage()
 			if awayMessage == "" {
 				awayMessage = "Disconnected" // auto-BRB
diff --git a/irc/idletimer.go b/irc/idletimer.go
index dca2712e..e4dc6a4f 100644
--- a/irc/idletimer.go
+++ b/irc/idletimer.go
@@ -425,6 +425,7 @@ func (bt *BrbTimer) processTimeout() {
 		} else {
 			// client resumed, reattached, or has another active session
 			bt.state = BrbDisabled
+			bt.brbAt = time.Time{}
 		}
 	case BrbDead:
 		dead = true // shouldn't be possible but whatever