Cache last restart changed value to auto hide notification bar

fix brave#2958
darkdh · Aug 10, 2016 · 67625f1 · 67625f1
1 parent c84e656
commit 67625f1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/app/index.js b/app/index.js
@@ -79,6 +79,7 @@ let throttleKeytar = false
 const passwordCallbacks = {}
 
 const prefsRestartCallbacks = {}
+const prefsRestartLastValue = {}
 
 /**
  * Gets the master key for encrypting login credentials from the OS keyring.
@@ -410,23 +411,31 @@ app.on('ready', () => {
       app.quit()
     })
 
-    ipcMain.on(messages.PREFS_RESTART, () => {
+    ipcMain.on(messages.PREFS_RESTART, (e, config, value) => {
       var message = locale.translation('prefsRestart')
-
-      appActions.showMessageBox({
-        buttons: [locale.translation('yes'), locale.translation('no')],
-        options: {
-          persist: false
-        },
-        message
-      })
-      prefsRestartCallbacks[message] = (buttonIndex, persist) => {
-        delete prefsRestartCallbacks[message]
-        if (buttonIndex === 0) {
-          app.relaunch({args: process.argv.slice(1) + ['--relaunch']})
-          app.quit()
-        } else {
-          appActions.hideMessageBox(message)
+      if (prefsRestartLastValue[config] !== undefined && prefsRestartLastValue[config] !== value) {
+        delete prefsRestartLastValue[config]
+        appActions.hideMessageBox(message)
+      } else {
+        appActions.showMessageBox({
+          buttons: [locale.translation('yes'), locale.translation('no')],
+          options: {
+            persist: false
+          },
+          message
+        })
+        prefsRestartCallbacks[message] = (buttonIndex, persist) => {
+          delete prefsRestartCallbacks[message]
+          if (buttonIndex === 0) {
+            app.relaunch({args: process.argv.slice(1) + ['--relaunch']})
+            app.quit()
+          } else {
+            delete prefsRestartLastValue[config]
+            appActions.hideMessageBox(message)
+          }
+        }
+        if (prefsRestartLastValue[config] === undefined) {
+          prefsRestartLastValue[config] = value
         }
       }
     })

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -437,7 +437,7 @@ class SecurityTab extends ImmutableComponent {
   }
   onToggleFlash (e) {
     aboutActions.setResourceEnabled(flash, e.target.value)
-    ipc.send(messages.PREFS_RESTART)
+    ipc.send(messages.PREFS_RESTART, flash, e.target.value)
   }
   render () {
     const lastPassPreferencesUrl = ('chrome-extension://' + extensionIds[passwordManagers.LAST_PASS] + '/tabDialog.html?dialog=preferences&cmd=open')
@@ -685,7 +685,7 @@ class AboutPreferences extends React.Component {
     aboutActions.changeSetting(key, value)
     if (key === settings.DO_NOT_TRACK || key === settings.HARDWARE_ACCELERATION_ENABLED ||
       key === settings.PDFJS_ENABLED || key === settings.SMOOTH_SCROLL_ENABLED) {
-      ipc.send(messages.PREFS_RESTART)
+      ipc.send(messages.PREFS_RESTART, key, value)
     }
   }