From 541a40b05653600d9d280a537a84a32af6a8c6a7 Mon Sep 17 00:00:00 2001 From: Jeremy Latt Date: Thu, 13 Feb 2014 20:38:22 -0800 Subject: [PATCH] touch should respect destroyed --- irc/client.go | 4 ++++ irc/socket.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/irc/client.go b/irc/client.go index c9e8b951..83482644 100644 --- a/irc/client.go +++ b/irc/client.go @@ -50,6 +50,10 @@ func NewClient(server *Server, conn net.Conn) *Client { } func (client *Client) Touch() { + if client.destroyed { + return + } + client.atime = time.Now() if client.quitTimer != nil { diff --git a/irc/socket.go b/irc/socket.go index e9ed86f7..f635ec50 100644 --- a/irc/socket.go +++ b/irc/socket.go @@ -66,7 +66,7 @@ func (socket *Socket) Write(lines []string) error { } func (socket *Socket) readLines() { - for !socket.closed { + for { line, err := socket.reader.ReadString('\n') if err != nil { if DEBUG_NET {