From 7ff4f12257dc28eda587c4a0c889cb2b4c2c9aaa Mon Sep 17 00:00:00 2001
From: Lajamerr Mittesdine <danieljmerritt4394@gmail.com>
Date: Sat, 11 Aug 2018 19:12:03 -0400
Subject: [PATCH] Fix Global FFZ emotes in Emote Popup (#663)

There was two instances of Global BTTV emotes.
Changed the second instance to Global FFZ emotes.
---
 src/widgets/dialogs/EmotePopup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp
index ade2a88a5..735d68f63 100644
--- a/src/widgets/dialogs/EmotePopup.cpp
+++ b/src/widgets/dialogs/EmotePopup.cpp
@@ -127,7 +127,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
     // global
     addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
               "BetterTTV");
-    addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
+    addEmotes(*globalChannel, *twitchChannel->globalFfz().emotes(),
               "FrankerFaceZ");
 
     // channel