From 2477ef33aabfbd866761d3d102e635b2655b1b1a Mon Sep 17 00:00:00 2001 From: Liam Stanley Date: Fri, 9 Dec 2016 05:37:01 -0500 Subject: [PATCH] state should never be nil --- main.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index 8fdd770..17d321a 100644 --- a/main.go +++ b/main.go @@ -137,6 +137,9 @@ func New(config Config) *Client { } client.log = log.New(client.Config.Logger, "", log.Ldate|log.Ltime|log.Lshortfile) + // Give ourselves a new state. + client.state = newState() + // Register builtin helpers. client.registerHelpers() @@ -153,10 +156,6 @@ func (c *Client) Quit(message string) { c.Send(&Event{Command: QUIT, Trailing: message}) - if c.state == nil { - return - } - if c.state.conn != nil { c.state.conn.Close() } @@ -358,10 +357,6 @@ func (c *Client) Reconnect() (err error) { // IRC server. If there is an error, it calls Reconnect. func (c *Client) readLoop() error { for { - if c.state == nil { - return ErrNotConnected - } - if c.state.reconnecting || c.state.hasQuit { return ErrNotConnected }