From 208fcf8f7eafc59b6516cacb91b557613ebbb00b Mon Sep 17 00:00:00 2001
From: Anthony Tseng <darkdh@gmail.com>
Date: Thu, 4 Aug 2016 11:54:50 +0800
Subject: [PATCH] Apply changes to brave/electron#33

fix #2400
---
 js/components/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/components/main.js b/js/components/main.js
index 8cf4c02a15f..28aa3e8d99c 100644
--- a/js/components/main.js
+++ b/js/components/main.js
@@ -7,6 +7,7 @@ const ImmutableComponent = require('./immutableComponent')
 const Immutable = require('immutable')
 const electron = global.require('electron')
 const ipc = electron.ipcRenderer
+const systemPreferences = electron.remote.systemPreferences
 
 // Actions
 const windowActions = require('../actions/windowActions')
@@ -179,7 +180,8 @@ class Main extends ImmutableComponent {
       swipeGesture = false
     })
     ipc.on('scroll-touch-begin', function () {
-      if (swipeGesture) {
+      if (swipeGesture &&
+        systemPreferences.isSwipeTrackingFromScrollEventsEnabled()) {
         trackingFingers = true
         startTime = (new Date()).getTime()
       }