From f45217337ab4cfa4b6155b868404e823cc7456e7 Mon Sep 17 00:00:00 2001
From: Cameron <cclarkjh@gmail.com>
Date: Wed, 2 Sep 2020 10:56:03 +0100
Subject: [PATCH] Remove message Appearing when reloading after changing user
 settings

---
 src/controllers/user/display/index.js   | 10 ++--------
 src/controllers/user/home/index.js      | 10 ++--------
 src/controllers/user/playback/index.js  | 10 ++--------
 src/controllers/user/subtitles/index.js | 10 ++--------
 4 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/src/controllers/user/display/index.js b/src/controllers/user/display/index.js
index a400c50ccf3..54f71ad5713 100644
--- a/src/controllers/user/display/index.js
+++ b/src/controllers/user/display/index.js
@@ -8,19 +8,13 @@ import autoFocuser from 'autoFocuser';
     const UserSettings = userSettings.UserSettings;
 
     export default function (view, params) {
-        function onBeforeUnload(e) {
-            if (hasChanges) {
-                e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
-            }
-        }
-
         let settingsInstance;
         let hasChanges;
+
         const userId = params.userId || ApiClient.getCurrentUserId();
         const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
-        view.addEventListener('viewshow', function () {
-            window.addEventListener('beforeunload', onBeforeUnload);
 
+        view.addEventListener('viewshow', function () {
             if (settingsInstance) {
                 settingsInstance.loadData();
             } else {
diff --git a/src/controllers/user/home/index.js b/src/controllers/user/home/index.js
index f811aa52b98..539365ff97c 100644
--- a/src/controllers/user/home/index.js
+++ b/src/controllers/user/home/index.js
@@ -9,19 +9,13 @@ import 'listViewStyle';
     const UserSettings = userSettings.UserSettings;
 
     export default function (view, params) {
-        function onBeforeUnload(e) {
-            if (hasChanges) {
-                e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
-            }
-        }
-
         let homescreenSettingsInstance;
         let hasChanges;
+
         const userId = params.userId || ApiClient.getCurrentUserId();
         const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
-        view.addEventListener('viewshow', function () {
-            window.addEventListener('beforeunload', onBeforeUnload);
 
+        view.addEventListener('viewshow', function () {
             if (homescreenSettingsInstance) {
                 homescreenSettingsInstance.loadData();
             } else {
diff --git a/src/controllers/user/playback/index.js b/src/controllers/user/playback/index.js
index 16c50a1980b..34a5ae0b1df 100644
--- a/src/controllers/user/playback/index.js
+++ b/src/controllers/user/playback/index.js
@@ -9,19 +9,13 @@ import 'listViewStyle';
     const UserSettings = userSettings.UserSettings;
 
     export default function (view, params) {
-        function onBeforeUnload(e) {
-            if (hasChanges) {
-                e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
-            }
-        }
-
         let settingsInstance;
         let hasChanges;
+
         const userId = params.userId || ApiClient.getCurrentUserId();
         const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
-        view.addEventListener('viewshow', function () {
-            window.addEventListener('beforeunload', onBeforeUnload);
 
+        view.addEventListener('viewshow', function () {
             if (settingsInstance) {
                 settingsInstance.loadData();
             } else {
diff --git a/src/controllers/user/subtitles/index.js b/src/controllers/user/subtitles/index.js
index 82f5270a4e8..efa2f1bead1 100644
--- a/src/controllers/user/subtitles/index.js
+++ b/src/controllers/user/subtitles/index.js
@@ -8,19 +8,13 @@ import autoFocuser from 'autoFocuser';
     const UserSettings = userSettings.UserSettings;
 
     export default function (view, params) {
-        function onBeforeUnload(e) {
-            if (hasChanges) {
-                e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
-            }
-        }
-
         let subtitleSettingsInstance;
         let hasChanges;
+
         const userId = params.userId || ApiClient.getCurrentUserId();
         const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
-        view.addEventListener('viewshow', function () {
-            window.addEventListener('beforeunload', onBeforeUnload);
 
+        view.addEventListener('viewshow', function () {
             if (subtitleSettingsInstance) {
                 subtitleSettingsInstance.loadData();
             } else {