From fb9d550b88ce21a168aa0c32618c52a7e16b4b05 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Tue, 24 Sep 2019 00:42:19 +0900
Subject: [PATCH] refs #948 Change auto-launch before save preferences

---
 src/renderer/store/Preferences/General.ts | 30 ++++++++++++-----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/renderer/store/Preferences/General.ts b/src/renderer/store/Preferences/General.ts
index 6aaf3244..8f914884 100644
--- a/src/renderer/store/Preferences/General.ts
+++ b/src/renderer/store/Preferences/General.ts
@@ -96,7 +96,7 @@ const actions: ActionTree<GeneralState, RootState> = {
     return new Promise((resolve, reject) => {
       ipcRenderer.once('error-update-preferences', (_, err: Error) => {
         ipcRenderer.removeAllListeners('response-update-preferences')
-        commit('changeLoading', false)
+        commit(MUTATION_TYPES.CHANGE_LOADING, false)
         reject(err)
       })
       ipcRenderer.once('response-update-preferences', (_, conf: BaseConfig) => {
@@ -119,20 +119,22 @@ const actions: ActionTree<GeneralState, RootState> = {
       general: newGeneral
     }
     return new Promise((resolve, reject) => {
-      // TODO: call change settings
-      ipcRenderer.once('error-update-preferences', (_, err: Error) => {
-        ipcRenderer.removeAllListeners('response-update-preferences')
-        commit(MUTATION_TYPES.CHANGE_LOADING, false)
-        reject(err)
+      ipcRenderer.once('response-change-auto-launch', () => {
+        ipcRenderer.once('error-update-preferences', (_, err: Error) => {
+          ipcRenderer.removeAllListeners('response-update-preferences')
+          commit(MUTATION_TYPES.CHANGE_LOADING, false)
+          reject(err)
+        })
+        ipcRenderer.once('response-update-preferences', (_, conf: BaseConfig) => {
+          ipcRenderer.removeAllListeners('error-update-preferences')
+          commit(MUTATION_TYPES.UPDATE_GENERAL, conf.general as General)
+          commit(MUTATION_TYPES.CHANGE_LOADING, false)
+          dispatch('App/loadPreferences', null, { root: true })
+          resolve(conf)
+        })
+        ipcRenderer.send('update-preferences', config)
       })
-      ipcRenderer.once('response-update-preferences', (_, conf: BaseConfig) => {
-        ipcRenderer.removeAllListeners('error-update-preferences')
-        commit(MUTATION_TYPES.UPDATE_GENERAL, conf.general as General)
-        commit(MUTATION_TYPES.CHANGE_LOADING, false)
-        dispatch('App/loadPreferences', null, { root: true })
-        resolve(conf)
-      })
-      ipcRenderer.send('update-preferences', config)
+      ipcRenderer.send('change-auto-launch', newOther.launch)
     })
   }
 }