From 092f66dc1505cf0a2d7b30999329d70914f98fd2 Mon Sep 17 00:00:00 2001 From: LosFarmosCTL <80157503+LosFarmosCTL@users.noreply.github.com> Date: Sat, 12 Feb 2022 02:57:33 -0800 Subject: [PATCH] Fix crash when displaying a highlight inside of a sub message with sub message highlights turned off (#3556) --- CHANGELOG.md | 1 + src/messages/SharedMessageBuilder.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e725ef5..e9e1c06e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -95,6 +95,7 @@ - Bugfix: Usercards no longer close when the originating window (e.g. a search popup) is closed. (#3518) - Bugfix: Disabled /popout and /streamlink from working in non-twitch channels (e.g. /whispers) when supplied no arguments. (#3541) - Bugfix: Fixed automod and unban messages showing when moderation actions were disabled (#3548) +- Bugfix: Fixed crash when rendering a highlight inside of a sub message, with sub message highlights themselves turned off. (#3556) - Dev: Batch checking live status for channels with live notifications that aren't connected. (#3442) - Dev: Add GitHub action to test builds without precompiled headers enabled. (#3327) - Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (#3103) diff --git a/src/messages/SharedMessageBuilder.cpp b/src/messages/SharedMessageBuilder.cpp index f7f63880..bce590e3 100644 --- a/src/messages/SharedMessageBuilder.cpp +++ b/src/messages/SharedMessageBuilder.cpp @@ -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(); }