From a0e46d3c926af492b3ae1a925253558869598c5b Mon Sep 17 00:00:00 2001 From: Matt Huggins Date: Mon, 17 Sep 2018 08:04:40 -0500 Subject: [PATCH 1/3] chore(api): fixed ipc early unsubscribe --- static/preloadRenderer.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/static/preloadRenderer.js b/static/preloadRenderer.js index ff7d7fce7..63baa8857 100644 --- a/static/preloadRenderer.js +++ b/static/preloadRenderer.js @@ -10,16 +10,17 @@ function createDelegate(channel) { const successChannel = `${channel}-success-${id}`; const failureChannel = `${channel}-failure-${id}`; - try { - ipcRenderer.once(successChannel, (event, ...successArgs) => resolve(...successArgs)); - ipcRenderer.once(failureChannel, (event, message) => reject(new Error(message))); - ipcRenderer.sendToHost(channel, id, ...args); - } catch (err) { - reject(err); - } finally { - ipcRenderer.removeAllListeners(successChannel); + ipcRenderer.once(successChannel, (event, ...successArgs) => { ipcRenderer.removeAllListeners(failureChannel); - } + resolve(...successArgs); + }); + + ipcRenderer.once(failureChannel, (event, message) => { + ipcRenderer.removeAllListeners(successChannel); + reject(new Error(message)); + }); + + ipcRenderer.sendToHost(channel, id, ...args); }); } From 4c4e87186c9f10d68651bf62cf0e8026fa5a487f Mon Sep 17 00:00:00 2001 From: Matt Huggins Date: Mon, 17 Sep 2018 07:15:23 -0700 Subject: [PATCH 2/3] chore(ci): fixed win32 deploy (#549) --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 99dae80d8..0698b66ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,6 +145,12 @@ workflows: ignore: /.*/ tags: only: /[0-9]+(\.[0-9]+)+.*/ + - deploy_win32: + filters: + branches: + ignore: /.*/ + tags: + only: /[0-9]+(\.[0-9]+)+.*/ - deploy_linux: filters: branches: From eedc731dcd350e546b0aa59053adcd839b9187cb Mon Sep 17 00:00:00 2001 From: Matt Huggins Date: Mon, 17 Sep 2018 07:40:11 -0700 Subject: [PATCH 3/3] chore(menu): fixed reload button error for account/settings (#551) --- src/main/util/bindMenus.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/util/bindMenus.js b/src/main/util/bindMenus.js index 73b2a917f..bd4cf1aca 100644 --- a/src/main/util/bindMenus.js +++ b/src/main/util/bindMenus.js @@ -10,6 +10,7 @@ const NULL_WEBVIEW = { isDevToolsOpened: () => false, goBack: noop, goForward: noop, + reload: noop, on: noop, addListener: noop, removeListener: noop