From dd3c572256db1f6bce8cc604babace6865a331c4 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Mon, 22 May 2017 21:57:19 +0200
Subject: Fix possible crash on nil (discord)

---
 bridge/discord/discord.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index 2a91adf9..f6f3077f 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -158,12 +158,14 @@ func (b *bdiscord) getNick(user *discordgo.User) string {
 	b.Lock()
 	defer b.Unlock()
 	if _, ok := b.userMemberMap[user.ID]; ok {
-		if b.userMemberMap[user.ID].Nick != "" {
-			// only return if nick is set
-			return b.userMemberMap[user.ID].Nick
+		if b.userMemberMap[user.ID] != nil {
+			if b.userMemberMap[user.ID].Nick != "" {
+				// only return if nick is set
+				return b.userMemberMap[user.ID].Nick
+			}
+			// otherwise return username
+			return user.Username
 		}
-		// otherwise return username
-		return user.Username
 	}
 	// if we didn't find nick, search for it
 	b.userMemberMap[user.ID], err = b.c.GuildMember(b.guildID, user.ID)
-- 
cgit v1.2.3