mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
Fix global emotes from not loading
We didn't called initialize properly on the EmoteManager Fix #374
This commit is contained in:
parent
5efc2c38d8
commit
12766f3b60
3 changed files with 1 additions and 6 deletions
|
@ -101,7 +101,7 @@ void Application::initialize()
|
||||||
|
|
||||||
this->highlights->initialize();
|
this->highlights->initialize();
|
||||||
|
|
||||||
this->emotes->loadGlobalEmotes();
|
this->emotes->initialize();
|
||||||
|
|
||||||
this->accounts->load();
|
this->accounts->load();
|
||||||
|
|
||||||
|
|
|
@ -91,10 +91,7 @@ void EmoteManager::initialize()
|
||||||
assert(currentUser);
|
assert(currentUser);
|
||||||
this->refreshTwitchEmotes(currentUser);
|
this->refreshTwitchEmotes(currentUser);
|
||||||
});
|
});
|
||||||
}
|
|
||||||
|
|
||||||
void EmoteManager::loadGlobalEmotes()
|
|
||||||
{
|
|
||||||
this->loadEmojis();
|
this->loadEmojis();
|
||||||
this->loadBTTVEmotes();
|
this->loadBTTVEmotes();
|
||||||
this->loadFFZEmotes();
|
this->loadFFZEmotes();
|
||||||
|
|
|
@ -29,8 +29,6 @@ public:
|
||||||
|
|
||||||
void initialize();
|
void initialize();
|
||||||
|
|
||||||
void loadGlobalEmotes();
|
|
||||||
|
|
||||||
void reloadBTTVChannelEmotes(const QString &channelName,
|
void reloadBTTVChannelEmotes(const QString &channelName,
|
||||||
std::weak_ptr<util::EmoteMap> channelEmoteMap);
|
std::weak_ptr<util::EmoteMap> channelEmoteMap);
|
||||||
void reloadFFZChannelEmotes(const QString &channelName,
|
void reloadFFZChannelEmotes(const QString &channelName,
|
||||||
|
|
Loading…
Reference in a new issue