Merge branch 'master' into apa-bits

2019-09-08 18:02:58 +02:00
parent 0c6a26d897 c6a05f289d
commit 9f1eb654fd
94 changed files with 1178 additions and 1640 deletions
@@ -952,7 +952,7 @@ void TwitchMessageBuilder::parseHighlights()
    {
        HighlightPhrase selfHighlight(
            currentUsername, getSettings()->enableSelfHighlightTaskbar,
-            getSettings()->enableSelfHighlightSound, false);
+            getSettings()->enableSelfHighlightSound, false, false);
        activeHighlights.emplace_back(std::move(selfHighlight));
    }

@@ -1171,7 +1171,7 @@ void TwitchMessageBuilder::appendTwitchBadges()
        {
            if (auto customModBadge = this->twitchChannel->ffzCustomModBadge())
            {
-                this->emplace<BadgeElement>(
+                this->emplace<ModBadgeElement>(
                        customModBadge.get(),
                        MessageElementFlag::BadgeChannelAuthority)
                    ->setTooltip((*customModBadge)->tooltip.string);