From 096be16bb10423ac3b4df62e07de3944a7164d3b Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 10 Aug 2018 15:32:31 -0700
Subject: [PATCH] Only restart timer if feedMouseArea doesn't contain mouse

---
 interface/resources/qml/hifi/Feed.qml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/Feed.qml b/interface/resources/qml/hifi/Feed.qml
index 0605c72f26..e1c712db1f 100644
--- a/interface/resources/qml/hifi/Feed.qml
+++ b/interface/resources/qml/hifi/Feed.qml
@@ -156,7 +156,9 @@ Column {
         onCurrentIndexChanged: {
             if (root.autoScrollTimerEnabled) {
                 autoScrollTimer.interval = suggestions.get(scroll.currentIndex).time_before_autoscroll_ms;
-                autoScrollTimer.start();
+                if (!feedMouseArea.containsMouse) {
+                    autoScrollTimer.start();
+                }
             }
         }