noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when receiving whisper (#2298)

Browse source 
PR #2284 introduced this bug: whispers aren't linked to a twitch channel
but we're storing user colors in a twitch channel. So, dereferencing
a nullptr. Not good.
This commit is contained in:
Wolf Clément 2020-12-20 09:38:34 +01:00 committed by GitHub
parent fea52faa66
commit b8104863a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/ChannelChatters.cpp
View file

@ -72,7 +72,7 @@ void ChannelChatters::setChatters(UsernameSet &&set)
const QColor ChannelChatters::getUserColor(const QString &user) const QColor ChannelChatters::getUserColor(const QString &user)
{ {
const auto chatterColors = this->chatterColors_.access(); const auto chatterColors = this->chatterColors_.accessConst();
const auto search = chatterColors->find(user.toLower()); const auto search = chatterColors->find(user.toLower());
if (search == chatterColors->end()) if (search == chatterColors->end())

3
src/providers/twitch/TwitchMessageBuilder.cpp
View file

@ -600,7 +600,10 @@ void TwitchMessageBuilder::parseUsername()
// } // }
this->message().loginName = this->userName; this->message().loginName = this->userName;
if (this->twitchChannel != nullptr)
{
this->twitchChannel->setUserColor(this->userName, this->usernameColor_); this->twitchChannel->setUserColor(this->userName, this->usernameColor_);
}
// Update current user color if this is our message // Update current user color if this is our message
auto currentUser = getApp()->accounts->twitch.getCurrent(); auto currentUser = getApp()->accounts->twitch.getCurrent();