From b4796d5548aa514646d753eba5ca1efe6e99cfc8 Mon Sep 17 00:00:00 2001
From: qeled <qeled9@gmail.com>
Date: Fri, 30 Oct 2015 22:28:13 +0300
Subject: [PATCH] Fix callback not being called in Client.joinServer

---
 src/Client.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Client.js b/src/Client.js
index 39c43e3c1..07f3ad27f 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -621,8 +621,10 @@ class Client extends EventEmitter {
 						callback(err);
 						reject(err);
 					} else {
-						if (self.getServer("id", res.body.guild.id)) {
-							resolve(self.getServer("id", res.body.guild.id));
+						var server = self.getServer("id", res.body.guild.id);
+						if (server) {
+							callback(null, server);
+							resolve(server);
 						} else {
 							self.serverCreateListener[res.body.guild.id] = [resolve, callback];
 						}