From a6a218d2fdc8e3a7e922845a0df4743ad45dcd1f Mon Sep 17 00:00:00 2001
From: Chris Rhodes <iopred@gmail.com>
Date: Tue, 12 Jan 2016 11:32:02 -0800
Subject: [PATCH] Avoid a potential issue where State tracking was disabled and
 it would return a stale Guild.

---
 restapi.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/restapi.go b/restapi.go
index 07177c0..3d2f6bb 100644
--- a/restapi.go
+++ b/restapi.go
@@ -321,10 +321,12 @@ func (s *Session) UserGuilds() (st []*Guild, err error) {
 // Guild returns a Guild structure of a specific Guild.
 // guildID   : The ID of a Guild
 func (s *Session) Guild(guildID string) (st *Guild, err error) {
-	// Attempt to grab the guild from State first.
-	st, err = s.State.Guild(guildID)
-	if err == nil {
-		return
+	if s.StateEnabled {
+		// Attempt to grab the guild from State first.
+		st, err = s.State.Guild(guildID)
+		if err == nil {
+			return
+		}
 	}
 
 	body, err := s.Request("GET", GUILD(guildID), nil)