From 12766f3b60879c130e8ca9f754cc29de64cbec71 Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sun, 6 May 2018 14:36:21 +0200
Subject: [PATCH] Fix global emotes from not loading

We didn't called initialize properly on the EmoteManager

Fix #374
---
 src/application.cpp             | 2 +-
 src/singletons/emotemanager.cpp | 3 ---
 src/singletons/emotemanager.hpp | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/application.cpp b/src/application.cpp
index b5a7f0a36..501669e91 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -101,7 +101,7 @@ void Application::initialize()
 
     this->highlights->initialize();
 
-    this->emotes->loadGlobalEmotes();
+    this->emotes->initialize();
 
     this->accounts->load();
 
diff --git a/src/singletons/emotemanager.cpp b/src/singletons/emotemanager.cpp
index 4b77f4589..3cd841f01 100644
--- a/src/singletons/emotemanager.cpp
+++ b/src/singletons/emotemanager.cpp
@@ -91,10 +91,7 @@ void EmoteManager::initialize()
         assert(currentUser);
         this->refreshTwitchEmotes(currentUser);
     });
-}
 
-void EmoteManager::loadGlobalEmotes()
-{
     this->loadEmojis();
     this->loadBTTVEmotes();
     this->loadFFZEmotes();
diff --git a/src/singletons/emotemanager.hpp b/src/singletons/emotemanager.hpp
index 98e316247..483c16d1f 100644
--- a/src/singletons/emotemanager.hpp
+++ b/src/singletons/emotemanager.hpp
@@ -29,8 +29,6 @@ public:
 
     void initialize();
 
-    void loadGlobalEmotes();
-
     void reloadBTTVChannelEmotes(const QString &channelName,
                                  std::weak_ptr<util::EmoteMap> channelEmoteMap);
     void reloadFFZChannelEmotes(const QString &channelName,