From a23bc74ae41a3dbc7d6c04531cf308262e892a38 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Wed, 4 Jul 2018 14:23:21 -0400
Subject: [PATCH] 4.0.0-rc4.2

* Fixed: Issue scrolling up with Smooth Scrolling enabled and Freeze on Hover disabled.
---
 changelog.html                                     | 5 +++++
 src/main.js                                        | 2 +-
 src/sites/twitch-twilight/modules/chat/scroller.js | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changelog.html b/changelog.html
index 73cf46ee..180d68b7 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,8 @@
+<div class="list-header">4.0.0-rc4.2<span>@bfc82fd92a39871e75ff</span> <time datetime="2018-07-04">(2018-07-04)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Issue scrolling up with Smooth Scrolling for Chat enabled without Freeze on Hover.</li>
+</ul>
+
 <div class="list-header">4.0.0-rc4.1<span>@3f78ab6b5e2898f3756f</span> <time datetime="2018-07-04">(2018-07-04)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Changed: Update the dark theme.</li>
diff --git a/src/main.js b/src/main.js
index bb20e3ef..b7233b81 100644
--- a/src/main.js
+++ b/src/main.js
@@ -100,7 +100,7 @@ class FrankerFaceZ extends Module {
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 0, revision: 0, extra: '-rc4.1',
+	major: 4, minor: 0, revision: 0, extra: '-rc4.2',
 	build: __webpack_hash__,
 	toString: () =>
 		`${VER.major}.${VER.minor}.${VER.revision}${VER.extra || ''}${DEBUG ? '-dev' : ''}`
diff --git a/src/sites/twitch-twilight/modules/chat/scroller.js b/src/sites/twitch-twilight/modules/chat/scroller.js
index 499b935d..c3c203a2 100644
--- a/src/sites/twitch-twilight/modules/chat/scroller.js
+++ b/src/sites/twitch-twilight/modules/chat/scroller.js
@@ -274,7 +274,7 @@ export default class Scroller extends Module {
 				}
 
 				const smoothAnimation = () => {
-					if ( this.state.ffzFrozen )
+					if ( this.state.ffzFrozen || ! this.state.isAutoScrolling )
 						return this.ffz_is_smooth_scrolling = false;
 
 					// See how much time has passed to get a step based off the delta