fixed crash when moderation buttons are enabled

2018-08-12 00:01:37 +02:00
parent b3fd278c3c
commit 1ec1ecd52b
15 changed files with 89 additions and 68 deletions
@@ -125,8 +125,10 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
        *globalChannel, *subChannel);

    // global
-    addEmotes(*globalChannel, *getApp()->emotes->bttv.global(), "BetterTTV");
-    addEmotes(*globalChannel, *getApp()->emotes->ffz.global(), "FrankerFaceZ");
+    addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
+              "BetterTTV");
+    addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
+              "FrankerFaceZ");

    // channel
    addEmotes(*channelChannel, *twitchChannel->bttvEmotes(), "BetterTTV");