From 8dbcf434cd3b1edaffecf6a33aa51000617d2352 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Sun, 25 Mar 2018 22:16:16 -0400
Subject: [PATCH] Update change-log. Fix a bug with cheer stacking when the
 standard cheers aren't available.

---
 changelog.html                 | 6 ++++++
 src/modules/chat/tokenizers.js | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/changelog.html b/changelog.html
index 44351da7..0f613ce4 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,9 @@
+<div class="list-header">4.0.0-beta1.7<span>@014a758f744a54c37b26</span> <time datetime="2018-03-25">(2018-03-25)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Added: Settings to hide the Event Bar and Rerun Bar over the player.</li>
+	<li>Fixed: Bug causing chat to not display properly with Cheer Stacking set to All in One in channels that don't have the standard cheers available, such as Overwatch League.</li>
+</ul>
+
 <div class="list-header">4.0.0-beta1.7<span>@177445c5a2dd0b0b9857</span> <time datetime="2018-03-24">(2018-03-24)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Changed: Reduce the size of badge previews in the badge visbility settings.</li>
diff --git a/src/modules/chat/tokenizers.js b/src/modules/chat/tokenizers.js
index 7cd3f156..5ad70cca 100644
--- a/src/modules/chat/tokenizers.js
+++ b/src/modules/chat/tokenizers.js
@@ -393,8 +393,11 @@ export const CheerEmotes = {
 					});
 
 					if ( collect ) {
-						const pref = collect === 2 ? 'cheer' : prefix,
-							group = collected[pref] = collected[pref] || {total: 0, individuals: []};
+						let pref = collect === 2 ? 'cheer' : prefix;
+						if ( ! actions[pref] )
+							pref = prefix;
+
+						const group = collected[pref] = collected[pref] || {total: 0, individuals: []};
 
 						group.total += amount;
 						group.individuals.push([amount, tier, prefix]);