noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

make ffz custom mod badge atomic

Browse source
This commit is contained in:
Rasmus Karlsson 2019-09-08 11:36:35 +02:00 committed by fourtf
parent 2cd07435bd
commit 862164bc2b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/providers/twitch/ChatroomChannel.cpp
View file

@ -55,7 +55,7 @@ void ChatroomChannel::refreshFFZChannelEmotes()
std::make_shared<EmoteMap>(std::move(emoteMap)));
},
[this](auto &&modBadge) {
this->ffzCustomModBadge_ = std::move(modBadge);
this->ffzCustomModBadge_.set(std::move(modBadge));
});
}

4
src/providers/twitch/TwitchChannel.cpp
View file

@ -171,7 +171,7 @@ void TwitchChannel::refreshFFZChannelEmotes()
[this, weak = weakOf<Channel>(this)](auto &&modBadge) {
if (auto shared = weak.lock())
{
this->ffzCustomModBadge_ = std::move(modBadge);
this->ffzCustomModBadge_.set(std::move(modBadge));
}
});
}
@ -829,7 +829,7 @@ boost::optional<EmotePtr> TwitchChannel::twitchBadge(
boost::optional<EmotePtr> TwitchChannel::ffzCustomModBadge() const
{
return this->ffzCustomModBadge_;
return this->ffzCustomModBadge_.get();
}
} // namespace chatterino

2
src/providers/twitch/TwitchChannel.hpp
View file

@ -147,7 +147,7 @@ protected:
FfzEmotes &globalFfz_;
Atomic<std::shared_ptr<const EmoteMap>> bttvEmotes_;
Atomic<std::shared_ptr<const EmoteMap>> ffzEmotes_;
boost::optional<EmotePtr> ffzCustomModBadge_;
Atomic<boost::optional<EmotePtr>> ffzCustomModBadge_;
private:
// Badges