chatterino2
Code Issues

Fix crash when displaying a highlight inside of a sub message with sub message highlights turned off (#3556)

Browse Source
This commit is contained in:
LosFarmosCTL
2022-02-12 02:57:33 -08:00
committed by GitHub
parent 5490ff5015
commit 092f66dc15
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/messages/SharedMessageBuilder.cpp
+6 -3
View File
@@ -217,7 +217,8 @@ void SharedMessageBuilder::parseHighlights()
<< "sent a message";
this->message().flags.set(MessageFlag::Highlighted);
if (!this->message().flags.has(MessageFlag::Subscription))
if (!(this->message().flags.has(MessageFlag::Subscription) &&
getSettings()->enableSubHighlight))
{
this->message().highlightColor = userHighlight.getColor();
}
@@ -289,7 +290,8 @@ void SharedMessageBuilder::parseHighlights()
}
this->message().flags.set(MessageFlag::Highlighted);
if (!this->message().flags.has(MessageFlag::Subscription))
if (!(this->message().flags.has(MessageFlag::Subscription) &&
getSettings()->enableSubHighlight))
{
this->message().highlightColor = highlight.getColor();
}
@@ -347,7 +349,8 @@ void SharedMessageBuilder::parseHighlights()
if (!badgeHighlightSet)
{
this->message().flags.set(MessageFlag::Highlighted);
if (!this->message().flags.has(MessageFlag::Subscription))
if (!(this->message().flags.has(MessageFlag::Subscription) &&
getSettings()->enableSubHighlight))
{
this->message().highlightColor = highlight.getColor();
}